diff --git a/config.nix b/config.nix
index cb7bb26..44e3c36 100644
--- a/config.nix
+++ b/config.nix
@@ -1,12 +1,7 @@
 {
   general = {
-<<<<<<< HEAD
     Hostname = "hakase";
     Username = "lsoriano";
-=======
-    Hostname = "TEXAS";
-    Username = "kenji";
->>>>>>> parent of 3ebe0c9 (udp)
     Timezone = "America/Chicago";
 
     allowUnfree = true; # allows installation of commercial apps.
diff --git a/hosts/macos/darwin.nix b/hosts/macos/darwin.nix
index 04808ee..16b8ac9 100644
--- a/hosts/macos/darwin.nix
+++ b/hosts/macos/darwin.nix
@@ -5,19 +5,12 @@
   ...
 }: {
   imports = [
-<<<<<<< HEAD
     ../../modules/dev.nix
-=======
-    ../../system/dev/macos.nix
->>>>>>> parent of 3ebe0c9 (udp)
   ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
-<<<<<<< HEAD
-=======
     python313
->>>>>>> parent of 3ebe0c9 (udp)
   ];
 
   # Auto upgrade nix package and the daemon service.