diff --git a/hosts/darkgui-vps/config/pkgs.nix b/hosts/darkgui-vps/config/pkgs.nix
index 622929c..2ef72c6 100644
--- a/hosts/darkgui-vps/config/pkgs.nix
+++ b/hosts/darkgui-vps/config/pkgs.nix
@@ -12,7 +12,6 @@
     git
     vim
     wget
-    screen
     fish
     btop
     fastfetch
diff --git a/hosts/darkgui-vps/configuration.nix b/hosts/darkgui-vps/configuration.nix
index cfacbf6..e5b6b92 100644
--- a/hosts/darkgui-vps/configuration.nix
+++ b/hosts/darkgui-vps/configuration.nix
@@ -17,10 +17,6 @@ in
   ];
 
   boot = {
-<<<<<<< HEAD
-    kernelPackages = pkgs.linux_cachyos-server;
-=======
->>>>>>> 8c424e69b85789b646939b1787e64e7cb8e5a341
     loader = {
       systemd-boot.enable = true;
       efi = {