diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 2abd9aa..2d34e87 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.24"
+    const versionNum = "1.4.26"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/project.config.json b/project.config.json
index 9664eaf..fb18f29 100644
--- a/project.config.json
+++ b/project.config.json
@@ -17,15 +17,22 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
+<<<<<<< HEAD
 		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"compileHotReLoad": false,
 		"useIsolateContext": true
+=======
+		"useIsolateContext": true,
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false
+>>>>>>> 5f77a3de8685061a23d87e7003a24ef1037572cf
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",