Fixed merge conflits

Author: sunil-lakshman

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
   - filename: package-lock.json
-    checksum: 26be769c9d3bcc7095237527dd0004c3981be0dc7bf5c01f650b05a0ea09ecb6
+    checksum: 21d5e66a045c155578dc6b6d747745b94c4591c1e17f5226b94b833a46ee9bff
   - filename: pnpm-lock.yaml
-    checksum: 44d84111971dd7c108417a3e6e35bb3c61347d3eff4ea113a636429085d8502b
+    checksum: a0e789a97a39aece1d637ed121bb6847d39dfb9033b71ea8bf10619eec2e246a
   - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
     checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
   - filename: packages/contentstack-import-setup/test/config.json

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.6.4",
+  "version": "1.7.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {

packages/contentstack-auth/package.json

@@ -6,7 +6,7 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@contentstack/cli-cm-export": "~1.22.3",
+    "@contentstack/cli-cm-export": "~1.23.0",
     "@contentstack/cli-cm-import": "~1.31.0",
     "@contentstack/cli-command": "~1.7.2",
     "@contentstack/cli-utilities": "~1.17.0",

packages/contentstack-clone/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.22.3",
+  "version": "1.23.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
@@ -21,7 +21,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.6.4",
+    "@contentstack/cli-auth": "~1.7.0",
     "@contentstack/cli-config": "~1.17.0",
     "@contentstack/cli-dev-dependencies": "~1.3.1",
     "@oclif/plugin-help": "^6.2.28",

packages/contentstack-export/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -23,9 +23,9 @@
   },
   "dependencies": {
     "@contentstack/cli-audit": "~1.17.0",
-    "@contentstack/cli-cm-export": "~1.22.3",
+    "@contentstack/cli-cm-export": "~1.23.0",
     "@contentstack/cli-cm-import": "~1.31.0",
-    "@contentstack/cli-auth": "~1.6.4",
+    "@contentstack/cli-auth": "~1.7.0",
     "@contentstack/cli-cm-bootstrap": "~1.18.0",
     "@contentstack/cli-cm-branches": "~1.6.3",
     "@contentstack/cli-cm-bulk-publish": "~1.10.5",