Fix/resolve conflicts#189

nadeem-cs merged 8 commits intodevelopmentcontentstack/contentstack-js-core:developmentfrom

fi/resolve-conflictscontentstack/contentstack-js-core:fi/resolve-conflictsCopy head branch name to clipboard