diff --git a/machines/pedro/configuration.nix b/machines/pedro/configuration.nix
index eed98c9..8eb36aa 100644
--- a/machines/pedro/configuration.nix
+++ b/machines/pedro/configuration.nix
@@ -68,47 +68,8 @@
         };
       };
     };
-<<<<<<< HEAD
     firewall = import ./firewall.nix;
     timeServers = [ "192.168.88.1" ] ++ options.networking.timeServers.default;
-=======
-    firewall = {
-      allowedTCPPorts = [
-        8384
-        22000 # syncthing
-        8080
-        8443
-        6789
-        8880
-        8843
-        27117 # unifi controller: https://help.ui.com/hc/en-us/articles/218506997-UniFi-Network-Required-Ports-Reference
-        53
-        8088 # pihole
-        #3000  # gitea
-        #8081  # vaultwarden
-        #8000  # paperless
-        80
-        443 # reverse proxy
-      ];
-      allowedUDPPorts = [
-        22000
-        21027 # syncthing
-        3478
-        5514
-        10001
-        1900
-        123 # unifi
-        53 # pihole
-      ];
-      allowedUDPPortRanges = [
-        {
-          from = 5656;
-          to = 5699;
-        } # unifi
-      ];
-    };
-    timeServers = ["192.168.88.1"] ++ options.networking.timeServers.default;
->>>>>>> 337a41901fccf4591c5315525a74e6e52d33589c
   };
 
   hardware.video.hidpi.enable = false;
@@ -119,13 +80,6 @@
   #package = pkgs.pulseaudioFull;
   #};
   hardware.bluetooth.enable = false;
-<<<<<<< HEAD
-=======
-  services.blueman.enable = false;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = false;
->>>>>>> 337a41901fccf4591c5315525a74e6e52d33589c
 
   # Enable sound.
   sound.enable = false;