diff --git a/flake.nix b/flake.nix
index 649aa993..991575c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,12 +107,8 @@
       warsaw-ovh-01       = libx.deploy { hostname = "warsaw-ovh-01"; };
     # nuc-server          = libx.deploy { hostname = "nuc-server"; };
 
-<<<<<<< Updated upstream
-      # Raspberry Pi's 
     # Temporarily removed due to moving
-=======
       # Raspberry Pi's  
->>>>>>> Stashed changes
     # backups-rpi4        = libx.deploy { hostname = "backups-rpi4";      system = "aarch64-linux"; };
     # piaware-rpi4        = libx.deploy { hostname = "piaware-rpi4";      system = "aarch64-linux"; };
       bakersfield-rpi4    = libx.deploy { hostname = "bakersfield-rpi4";  system = "aarch64-linux"; };