diff --git a/home/profiles/opencode/default.nix b/home/profiles/opencode/default.nix
index 17efd7f..10fce1f 100644
--- a/home/profiles/opencode/default.nix
+++ b/home/profiles/opencode/default.nix
@@ -114,9 +114,6 @@ in
     "opencode/themes".source = ./themes;
     "opencode/agents".source = ./agents;
     "opencode/commands".source = ./commands;
-<<<<<<< HEAD
-    "opencode/skills".source = ./skills;
-=======
 
     # Local skills
     "opencode/skills/tmux".source = ./skills/tmux;
@@ -131,7 +128,6 @@ in
     # Plugins: combined derivation with correct layout for OpenCode's
     # plugin loader (only entry points at top level)
     "opencode/plugins".source = opencode-plugins;
->>>>>>> 64f30fc4d82e01dc9b381096bb4cc8cd5498c6c4
   };
 
   home.file = lib.mkIf isBox {