diff --git a/.obsidian/plugins/hoarder-sync/data.json b/.obsidian/plugins/hoarder-sync/data.json
index ed197b1..3bd644e 100644
--- a/.obsidian/plugins/hoarder-sync/data.json
+++ b/.obsidian/plugins/hoarder-sync/data.json
@@ -4,11 +4,7 @@
   "syncFolder": "Hoarder",
   "attachmentsFolder": "Hoarder/attachments",
   "syncIntervalMinutes": 60,
-<<<<<<< HEAD
-  "lastSyncTimestamp": 1778413642499,
-=======
-  "lastSyncTimestamp": 1778357481550,
->>>>>>> origin/main
+  "lastSyncTimestamp": 1778417241907,
   "updateExistingFiles": false,
   "excludeArchived": true,
   "onlyFavorites": false,
diff --git a/99 Daily/2026-05-10.md b/99 Daily/2026-05-10.md
index 8515163..61be7f5 100644
--- a/99 Daily/2026-05-10.md	
+++ b/99 Daily/2026-05-10.md	
@@ -164,3 +164,6 @@ tags: [daily]
 - 13:42 | `barclays-rag-report`
   - **Asked:** Create a CLAUDE.md file documenting codebase commands, architecture, and setup for future Claude instances.
   - **Done:** Analyzed codebase structure and started CLAUDE.md documentation with build/lint/test commands and architecture overview.
+- 14:01 | `figma`
+  - **Asked:** Asked | Done | Log
+  - **Done:** ---|---|---