diff --git a/README.md b/README.md
index 6bbf5c1..5d6a63c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
 # testing-things
-hhh
-=======
-
-# testing-things@
 
 This is the repo where @hiimbex tests amazing things.
-