diff --git a/pkgs/ungoogled-chromium/default.nix b/pkgs/ungoogled-chromium/default.nix
index 0a776f7..2074a0b 100644
--- a/pkgs/ungoogled-chromium/default.nix
+++ b/pkgs/ungoogled-chromium/default.nix
@@ -1,10 +1,10 @@
-{ prev, pkgs, ... }:
+{ prev, ... }:
 
 prev.runCommandNoCC "wrap-chromium"
-{ buildInputs = with pkgs; [ makeWrapper ]; }
+{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
   ''
-    makeWrapper ${c}/bin/chromium $out/bin/chromium \
+    makeWrapper ${prev.pkgs.chromium}/bin/chromium $out/bin/chromium \
       --add-flags "--enable-features=UseOzonePlatform" \
       --add-flags "--ozone-platform=wayland"
-    ln -sf ${c}/share $out/share
+    ln -sf ${prev.pkgs.chromium}/share $out/share
   ''
diff --git a/pkgs/vscodium/default.nix b/pkgs/vscodium/default.nix
index af087a5..d73377c 100644
--- a/pkgs/vscodium/default.nix
+++ b/pkgs/vscodium/default.nix
@@ -1,10 +1,10 @@
-{ prev, pkgs, ... }:
+{ prev, ... }:
 
 prev.runCommandNoCC "codium"
-{ buildInputs = with pkgs; [ makeWrapper ]; }
+{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
   ''
-    makeWrapper ${prev.vscodium}/bin/codium $out/bin/codium \
+    makeWrapper ${prev.pkgs.vscodium}/bin/codium $out/bin/codium \
       --add-flags "--enable-features=UseOzonePlatform" \
       --add-flags "--ozone-platform=wayland"
-    ln -sf ${prev.vscodium}/share $out/share
+    ln -sf ${prev.pkgs.vscodium}/share $out/share
   ''
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix
index 83a26a4..e1bfd29 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs/default.nix
@@ -12,18 +12,12 @@
   };
 
   home.packages = with pkgs; [
-<<<<<<< HEAD
-=======
     python-language-server
     python
->>>>>>> 651ab71 (Emacs and inputs updated)
     fd
     ag
     nixpkgs-fmt
     rnix-lsp
-<<<<<<< HEAD
-  ] ++ (if config.network.hostname != "mbp" then python-language-server else [ ]);
-=======
     (
       makeDesktopItem {
         name = "org-protocol";
@@ -36,5 +30,4 @@
       }
     )
   ];
->>>>>>> 651ab71 (Emacs and inputs updated)
 }