diff --git a/README.md b/README.md
index a4dd161..fec033d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
 # x11-autoclicker
 
 Rudimentary autoclicker for X11 Linux setups
-=======
-# Test
-
-* Element 1
-
-* Element 2
->>>>>>> ad1d17c (Startup)