diff --git a/README.md b/README.md
index c2455c9..759e36e 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,10 @@ 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.
 
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 2bcf4dc..de4eb17 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -51,5 +51,4 @@ services = {
     };
   };
 };
->>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
 }