diff --git a/99 Daily/2026-04-27.md b/99 Daily/2026-04-27.md
index 924c3e4..4a3cb57 100644
--- a/99 Daily/2026-04-27.md	
+++ b/99 Daily/2026-04-27.md	
@@ -457,3 +457,9 @@ tags: [daily]
   - **Asked:** Asked | Check Obsidian integration and verify wiki configuration with complete index files
   - **Done:** Done | Verified compilation without errors and confirmed wiki-count-sync.py functionality
 >>>>>>> Stashed changes
+- 18:36 | `obsidian-vault`
+  - **Asked:** Set up ntfy on homelab and check where alerts are currently sent.
+  - **Done:** Resolved merge conflict in daily note after pushing stashed changes.
+- 18:36 | `obsidian-vault`
+  - **Asked:** Configure ntfy alert destination on homelab | Resolved git sync conflict from iCloud duplication and merged divergent histories | .git/refs/heads/main, .git/refs/heads/ORIG_HEAD, daily notes file
+  - **Done:** Git conflict resolution | Removed iCloud duplicates, merged histories, resolved note conflicts, pushed clean state | .git directory, refs files, daily note