diff --git a/skills/bastos/obsidian-daily/SKILL.md b/skills/bastos/obsidian-daily/SKILL.md
index 4eb8587dc..c1a83a075 100644
--- a/skills/bastos/obsidian-daily/SKILL.md
+++ b/skills/bastos/obsidian-daily/SKILL.md
@@ -1,12 +1,10 @@
 ---
 name: obsidian-daily
 description: Manage Obsidian Daily Notes via obsidian-cli. Create and open daily notes, append entries (journals, logs, tasks, links), read past notes by date, and search vault content. Handles relative dates like "yesterday", "last Friday", "3 days ago". Requires obsidian-cli installed via Homebrew (Mac/Linux) or Scoop (Windows).
-<<<<<<< Updated upstream
+license: MIT
 metadata:
   author: github.com/bastos
   version: "2.0"
-=======
->>>>>>> Stashed changes
 ---
 
 # Obsidian Daily Notes