diff --git a/hosts/dell-5590/nixpkgs/home.nix b/hosts/dell-5590/nixpkgs/home.nix
index a853394..f05e98b 100644
--- a/hosts/dell-5590/nixpkgs/home.nix
+++ b/hosts/dell-5590/nixpkgs/home.nix
@@ -10,7 +10,6 @@
     ./mails.nix
     ./dunst.nix
     ./bat.nix
-    ./AstroNvim.nix
 #    ./redshift.nix
 #    ../../../modules/neovim.nix
     ../../../modules/rust.nix
diff --git a/hosts/dell-5590/nixpkgs/packages.nix b/hosts/dell-5590/nixpkgs/packages.nix
index bcecda9..aca36ae 100644
--- a/hosts/dell-5590/nixpkgs/packages.nix
+++ b/hosts/dell-5590/nixpkgs/packages.nix
@@ -66,10 +66,8 @@
     openvpn_24
     networkmanager-openvpn
     python39Packages.grip
-    super-productivity
   ];
   nixpkgs.config.permittedInsecurePackages = [
     "ferdi-5.8.1"
-    "electron-17.4.1"
   ];
 }
diff --git a/modules/tmux.nix b/modules/tmux.nix
index 93fd1fc..578e027 100644
--- a/modules/tmux.nix
+++ b/modules/tmux.nix
@@ -14,10 +14,6 @@
       tmuxPlugins.better-mouse-mode
       tmuxPlugins.sidebar
       tmuxPlugins.nord
-<<<<<<< HEAD
-=======
-#      tmuxPlugins.tmux-power
->>>>>>> 81fd413a21a3746680efd2260ca947a9bbfc0732
     ];
 
     extraConfig = ''