diff --git a/home.nix b/home.nix
index c14366a..a82daa4 100644
--- a/home.nix
+++ b/home.nix
@@ -12,7 +12,6 @@
   # environment.
   home.packages = with pkgs; [
     arp-scan
-    autossh
     bat
     diskonaut
     doggo
@@ -123,10 +122,7 @@
     };
   };
 
-<<<<<<< HEAD
-=======
   # direnv
->>>>>>> 9c27199 (Update)
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;