diff --git a/applications/wechat/README.md b/applications/wechat/README.md
index 7dee285..a56a38d 100644
--- a/applications/wechat/README.md
+++ b/applications/wechat/README.md
@@ -1,3 +1,4 @@
+<<<<<<< applications/wechat/README.md
 {
 "name" : "hostname",
 "cluster_name" : "opensearch",
@@ -15,4 +16,46 @@
 },
 "tagline" : "The OpenSearch Project: https://opensearch.org/"
 }
-test3
\ No newline at end of file
+test3
+=======
+# For new installations of OpenSearch 2.12 and later, you must define a custom admin password in order to set up a demo security configuration.
+# Use one of the following commands to define a custom admin password:
+
+## Install the x64 package using yum.
+sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> yum install opensearch-2.17.1-linux-x64.rpm
+
+## Install the x64 package using rpm.
+sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> rpm -ivh opensearch-2.17.1-linux-x64.rpm
+
+## Install the arm64 package using yum.
+sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> yum install opensearch-2.17.1-linux-arm64.rpm
+
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+SSWORD=<custom-admin-password> rpm -ivh opensearch-2.17.1-linux-arm64.rpm
+
+# Use the following command for OpenSearch versions 2.11 and earlier:
+
+## Install the x64 package using yum.
+sudo yum install opensearch-2.17.1-linux-x64.rpm
+
+## Install the x64 package using rpm.
+sudo rpm -ivh opensearch-2.17.1-linux-x64.rpm
+
+## Install the arm64 package using yum.
+sudo yum install opensearch-2.17.1-linux-arm64.rpm
+
+## Install the arm64 package using rpm.
+sudo rpm -ivh opensearch-2.17.1-linux-arm64.rpm
+
+## test1
+
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+## E46B50683A96499886A7BE07C339EF84
+>>>>>> applications/wechat/README.md
diff --git a/applications/义乌购/app.json b/applications/义乌购/app.json
index d38295a..5008180 100644
--- a/applications/义乌购/app.json
+++ b/applications/义乌购/app.json
@@ -4,10 +4,13 @@
   "longName": "77",
   "developer": "",
   "website": "",
+<<<<<<< applications/义乌购/app.json
   "packageName": {
     "android": "1",
     "ios": ""
   },
+======
+>>>>>>> applications/义乌购/app.json
   "properties": {
     "category": "",
     "subcategory": "",