diff --git a/modules/applications/darwin.nix b/modules/applications/darwin.nix
index b3f2522..6110035 100644
--- a/modules/applications/darwin.nix
+++ b/modules/applications/darwin.nix
@@ -43,13 +43,9 @@
       "krita"
       "blender"
       "obs"
-<<<<<<< HEAD
-      "grayjay"
       "gimp"
       "1password"
       "signal"
-=======
->>>>>>> parent of d81ffe3 (applications: add grayjay)
 
       "the-unarchiver"
       "linearmouse"