Merge remote-tracking branch 'git/main'
# Conflicts: # .obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json # Workspace/SpringTraveler.com/viator calendar - Google Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtmlmain
commit
ab51deea6c