Fixed merge conflits

Author: sunil-lakshman

package-lock.json

@@ -362,6 +362,10 @@ EXAMPLES
 
   $ csdx config:set:region EU
 
+  $ csdx config:set:region AWS-NA
+
+  $ csdx config:set:region AWS-EU
+
   $ csdx config:set:region AZURE-NA
 
   $ csdx config:set:region AZURE-EU

packages/contentstack-config/README.md

@@ -4,7 +4,7 @@
   "version": "1.21.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
-
+  "dependencies": {
     "@contentstack/cli-audit": "~1.11.0",
     "@contentstack/cli-command": "~1.4.0",
     "@contentstack/cli-utilities": "~1.10.0",

packages/contentstack-import/package.json

@@ -3582,6 +3582,10 @@ EXAMPLES
 
   $ csdx config:set:region EU
 
+  $ csdx config:set:region AWS-NA
+
+  $ csdx config:set:region AWS-EU
+
   $ csdx config:set:region AZURE-NA
 
   $ csdx config:set:region AZURE-EU