diff --git a/modules/applications/darwin.nix b/modules/applications/darwin.nix
index 4450c92..b3f2522 100644
--- a/modules/applications/darwin.nix
+++ b/modules/applications/darwin.nix
@@ -11,7 +11,6 @@
     "/Applications/1Password.app"
     { spacer.small = true; }
 
-    "/Applications/Grayjay.app"
     "/Applications/Infuse.app"
     { spacer.small = true; }
 
@@ -44,10 +43,13 @@
       "krita"
       "blender"
       "obs"
+<<<<<<< HEAD
       "grayjay"
       "gimp"
       "1password"
       "signal"
+=======
+>>>>>>> parent of d81ffe3 (applications: add grayjay)
 
       "the-unarchiver"
       "linearmouse"