diff --git a/apps/README.md b/apps/README.md
index 6e3d10b54..0fbed89ca 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -1,11 +1,8 @@
 ---
 layout: page
 title: Software Archives
-<<<<<<< HEAD
-=======
 menu_title: Apps
 menu_order: 2
->>>>>>> master
 permalink: /apps/
 ---