diff --git a/modules/system/base.nix b/modules/system/base.nix
index 52ee8a6..f2eb52d 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -6,11 +6,8 @@
 
 	boot.tmp.cleanOnBoot = true;
 	environment.systemPackages = map lib.lowPrio [
-<<<<<<< HEAD
-		pkgs.cloud-init
-=======
 		pkgs.binutils
->>>>>>> 3563d6b (Add binutils to all servers)
+		pkgs.cloud-init
 		pkgs.curl
 		pkgs.dig
 		pkgs.htop