diff --git a/apps/coretemp/coretemp.js b/apps/coretemp/coretemp.js
index e628a25ca..7cbbe3577 100644
--- a/apps/coretemp/coretemp.js
+++ b/apps/coretemp/coretemp.js
@@ -20,11 +20,7 @@ var corelogo = {
 
 function onCore(c) {
   // Large or small font
-<<<<<<< HEAD
   var sz = ((process.env.HWVERSION == 1) ? 3 : 2);
-=======
-  sz = (process.env.HWVERSION == 1) ? 3 : 2;
->>>>>>> 9acf9c89e2a1e1bef8716d44661cf6dcf3ff232b
 
   g.setFontAlign(0, 0);
   g.clearRect(0, 32 + 48, g.getWidth(), 32 + 48 + 24 * 4);
@@ -60,11 +56,7 @@ Bangle.on('CoreTemp', onCore);
 settings = require("Storage").readJSON("coretemp.json", 1) || {};
 
 if (!settings.enabled) {
-<<<<<<< HEAD
   drawBackground("Sensor off\nBTN" +
-=======
-  drawBackground("Sensor disabled\nBTN" +
->>>>>>> 9acf9c89e2a1e1bef8716d44661cf6dcf3ff232b
                  ((process.env.HWVERSION == 1) ? '2' : '1') + " to enable");
 } else {
   drawBackground("Waiting for\ndata...");