diff --git a/package.json b/package.json
index a0b1f2d5..44b82d48 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "pxt-microbit",
-<<<<<<< HEAD
-  "version": "0.2.166",
-=======
   "version": "0.2.168",
->>>>>>> origin/master
   "description": "BBC micro:bit target for PXT",
   "keywords": [
     "JavaScript",