diff --git a/config/index.js b/config/index.js
index 06bdc39..72e858a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -20,11 +20,7 @@ module.exports = {
 
     // Various Dev Server settings
     // host: '192.168.43.94', // can be overwritten by process.env.HOST
-<<<<<<< HEAD
     host: IP, // can be overwritten by process.env.HOST
-=======
-    //host: '192.168.43.94', // can be overwritten by process.env.HOST
->>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index 852476c..37a446a 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -174,10 +174,7 @@ export default {
       loading: false,
       auth: [],
       recordType: 0,
-<<<<<<< HEAD
       clientHeight: 0
-=======
->>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
     }
   },
   components: {