diff --git a/README.md b/README.md
index d577dc7..99a8aba 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,5 @@
 - (Optional) use unstable version: `git checkout dev`
 - Add permissions as root: `chmod +x src/tidler`
 - Run: `src/tidler`
-<<<<<<< HEAD
 - (Alternative) look into scripts/ for install scripts
-- Enjoy! :)
-=======
-- (Alternative) Take a look at the installation scripts in `scripts/`
 - Enjoy! :)
\ No newline at end of file