diff --git a/apps.json b/apps.json
index 2be79db83..c46de601d 100644
--- a/apps.json
+++ b/apps.json
@@ -1568,7 +1568,6 @@
       {"name":"hidjoystick.img","url":"app-icon.js","evaluate":true}
     ]
   },
-<<<<<<< HEAD
   {
     "id": "largeclock",
     "name": "Large Clock",