diff --git a/README.md b/README.md
index 5d6f6ae4a81837f459bd789cc063c09751ca3448..b665e6277658512a563d702da1e945a08af39114 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # collision-detection-frontend
 
 > Webpage for collision detection benchmark server
@@ -20,9 +19,4 @@ npm run build --report
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
-=======
-# frontend
 
-Frontend for
-OpenCollBench
->>>>>>> f7140204d51b6bb98a96cc8448521788836b2724