diff --git a/enka/packages.nix b/enka/packages.nix
index 8a9e29c..fc2ade9 100644
--- a/enka/packages.nix
+++ b/enka/packages.nix
@@ -30,15 +30,7 @@
   zig
 ]))
 
-<<<<<<< Updated upstream:enka/packages.nix
-])
-
-(with pkgs; graphicalPackages [
-  jetbrains.idea-ultimate
-
-=======
 (graphicalPackages (with pkgs; [
->>>>>>> Stashed changes:modules/packages/default.nix
   qbittorrent
   thunderbird
   whatsapp-for-linux