resolved conflicts

Author: naman-contentstack

packages/contentstack/README.md

@@ -3775,7 +3775,7 @@ USAGE
   $ csdx launch:functions [-p <value>] [-d <value>]
 
 FLAGS
-  -d, --data-dir=<value>  [default: /Users/naman.dembla/Documents/cli/packages/contentstack] Current working directory
+  -d, --data-dir=<value>  [default: /Users/aman.kumar/Documents/cli-repo/cli/packages/contentstack] Current working directory
   -p, --port=<value>      [default: 3000] Port number
 
 DESCRIPTION