diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix
index d9b4cd8..381d2ee 100644
--- a/hosts/lungmen.nix
+++ b/hosts/lungmen.nix
@@ -180,7 +180,7 @@ in
 
   fonts = {
     enableDefaultFonts = true;
-    fontconfig.enable = true;    
+    fontconfig.enable = true;
     fonts = [ pkgs.dejavu_fonts ];
   };
 
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index c50056c..851a697 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -12,18 +12,6 @@ channels: final: prev: {
     signal-desktop
     starship;
 
-<<<<<<< HEAD
-  haskellPackages = prev.haskellPackages.override {
-    overrides = hfinal: hprev:
-      let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
-      in
-      {
-        # same for haskell packages, matching ghc versions
-        inherit (channels.latest.haskell.packages."ghc${version}")
-          haskell-language-server;
-      };
-  };
-=======
 
   haskellPackages = prev.haskellPackages.override
     (old: {
@@ -36,5 +24,4 @@ channels: final: prev: {
             haskell-language-server;
         });
     });
->>>>>>> upstream/develop
 }
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 49c0e53..3cfcac8 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -166,7 +166,7 @@ in
   programs.command-not-found.enable = false;
   home-manager.useGlobalPkgs = true;
   users.mutableUsers = false;
-      
+
   # For rage encryption, all hosts need a ssh key pair
   services.openssh = {
     enable = true;