diff --git a/bower.json b/bower.json
index d336061d4..0c55d76af 100644
--- a/bower.json
+++ b/bower.json
@@ -38,13 +38,10 @@
     "catiline": "~2.9.3",
     "d3": "~3.4.4",
     "nanoscroller": "~0.8.0",
-<<<<<<< HEAD
     "jquery.tablesorter": "~2.15.13",
     "treema": "~0.0.1",
-    "bootstrap": "~3.1.1"
-=======
+    "bootstrap": "~3.1.1",
     "validated-backbone-mediator": "~0.1.3"
->>>>>>> a07457acacd24719568e5abecff2843f59ec97bb
   },
   "overrides": {
     "backbone": {