diff --git a/content/.obsidian/plugins/obsidian-git/data.json b/content/.obsidian/plugins/obsidian-git/data.json
index b3d13be4..bc32d31f 100644
--- a/content/.obsidian/plugins/obsidian-git/data.json
+++ b/content/.obsidian/plugins/obsidian-git/data.json
@@ -12,7 +12,7 @@
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": true,
-  "syncMethod": "rebase",
+  "syncMethod": "merge",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,