diff --git a/README.md b/README.md
index 759e36e..26734c0 100644
--- a/README.md
+++ b/README.md
@@ -80,10 +80,6 @@ If you have a `nixos-rebuild` available on your system it can automatize these t
 `--target-host` parameters. But there are some pitfalls so look at the `nixos-rebuild` documentation beforehand.
 
 ### On the machine
-<<<<<<< HEAD
-
-=======
->>>>>>> d89313e25d9c66bafdaed10bb11716589472bac3
 clone this repo to `/etc/nixos/` and `nixos-rebuild boot` or `nixos-rebuild switch` that will select
 the appropriate machine based on hostname.