diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
index 0d84d38..3c70727 100644
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -51,7 +51,7 @@
   </view>
 
   <view class="uploader">
-    <button bindtap="to_new_mood_tracking">go to new Questionnaire</button>
+    <button bindtap="toMoodTracking">go to new Mood Tracking</button>
   </view>
 
 
diff --git a/project.config.json b/project.config.json
index 5c40a8a..5f7dd89 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,95 +1,95 @@
 {
-  "miniprogramRoot": "miniprogram/",
-  "cloudfunctionRoot": "cloudfunctions/",
-  "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "appid": "wxce2e39d26aad783a",
-  "projectname": "miniprogram-2",
-  "libVersion": "2.14.1",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "cloudfunctionTemplateRoot": "cloudfunctionTemplate",
-  "compileType": "miniprogram",
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": -1,
-          "name": "db guide",
-          "pathName": "pages/databaseGuide/databaseGuide",
-          "query": ""
-        },
-        {
-          "id": 1,
-          "name": "pages/charts/charts",
-          "pathName": "pages/charts/charts",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "pages/medTracking/medTracking",
-          "pathName": "pages/medTracking/medTracking",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": 3,
-          "name": "pages/moodTracking/moodTracking",
-          "pathName": "pages/moodTracking/moodTracking",
-          "query": "",
-          "scene": null
-        }
-      ]
-    }
-  }
+	"miniprogramRoot": "miniprogram/",
+	"cloudfunctionRoot": "cloudfunctions/",
+	"setting": {
+		"urlCheck": true,
+		"es6": true,
+		"enhance": true,
+		"postcss": true,
+		"preloadBackgroundData": false,
+		"minified": true,
+		"newFeature": true,
+		"coverView": true,
+		"nodeModules": false,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
+		"useMultiFrameRuntime": true,
+		"useApiHook": true,
+		"useApiHostProcess": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useIsolateContext": true,
+		"userConfirmedBundleSwitch": false,
+		"packNpmManually": false,
+		"packNpmRelationList": [],
+		"minifyWXSS": true,
+		"disableUseStrict": false,
+		"minifyWXML": true,
+		"showES6CompileOption": false,
+		"useCompilerPlugins": false
+	},
+	"appid": "wxce2e39d26aad783a",
+	"projectname": "miniprogram-2",
+	"libVersion": "2.14.1",
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
+	"compileType": "miniprogram",
+	"condition": {
+		"search": {
+			"list": []
+		},
+		"conversation": {
+			"list": []
+		},
+		"plugin": {
+			"list": []
+		},
+		"game": {
+			"list": []
+		},
+		"gamePlugin": {
+			"list": []
+		},
+		"miniprogram": {
+			"list": [
+				{
+					"id": -1,
+					"name": "db guide",
+					"pathName": "pages/databaseGuide/databaseGuide",
+					"query": ""
+				},
+				{
+					"id": 1,
+					"name": "pages/index/index",
+					"pathName": "pages/index/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/medTracking/medTracking",
+					"pathName": "pages/medTracking/medTracking",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 3,
+					"name": "pages/moodTracking/moodTracking",
+					"pathName": "pages/moodTracking/moodTracking",
+					"query": "",
+					"scene": null
+				}
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 7045708..eca4e42 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -50,13 +50,8 @@
           "scene": null
         },
         {
-<<<<<<< HEAD
-          "name": "pages/infoPage/infoPage",
-          "pathName": "pages/infoPage/infoPage",
-=======
           "name": "pages/index/index",
           "pathName": "pages/index/index",
->>>>>>> main
           "query": "",
           "scene": null
         }