diff --git a/modules/nixos/desktop/addons/hyprpaper/default.nix b/modules/nixos/desktop/addons/hyprpaper/default.nix
index 6481006..5f19b72 100644
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@@ -1,15 +1,7 @@
 {
   config,
-<<<<<<< HEAD
   lib,
   namespace,
-=======
-  inputs,
-  lib,
-  namespace,
-  pkgs,
-  system,
->>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
   ...
 }:
 let