fix: resolve merge conflicts from master#11

simrndeepsingh merged 3 commits into

developElementMint/date:developfrom

fix/merge-master-into-developElementMint/date:fix/merge-master-into-developCopy head branch name to clipboard