diff --git a/README.md b/README.md
index 99a8aba..ba29910 100644
--- a/README.md
+++ b/README.md
@@ -21,5 +21,10 @@
 - (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! :)
\ No newline at end of file
+- Enjoy! :)
+=======
+- (Alternative) Take a look at the installation scripts in `scripts/`
+- Enjoy! :)
+>>>>>>> 672c8b8 (Update README.md)