diff --git a/.gitignore b/.gitignore
index 8615dee..e19eb79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 .obsidian/workspace.json
 .obsidian/workspace-mobile.json
 .DS_Store
+.obsidian/graph.json
+.obsidian/hotkeys.json
+.obsidian/*.sync-*
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index fde1bde..b700a96 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -17,7 +17,7 @@
   "showStatusBar": true,
   "updateSubmodules": false,
   "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "mergeStrategy": "theirs",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,