diff --git a/Seighell/.obsidian/plugins/obsidian-git/data.json b/Seighell/.obsidian/plugins/obsidian-git/data.json
index b6cd1d3..f2c5c86 100644
--- a/Seighell/.obsidian/plugins/obsidian-git/data.json
+++ b/Seighell/.obsidian/plugins/obsidian-git/data.json
@@ -17,7 +17,7 @@
   "showStatusBar": true,
   "updateSubmodules": false,
   "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "mergeStrategy": "theirs",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": true,
   "treeStructure": false,
diff --git a/Seighell/.obsidian/plugins/obsidian-style-settings/data.json b/Seighell/.obsidian/plugins/obsidian-style-settings/data.json
deleted file mode 100644
index 2000969..0000000
--- a/Seighell/.obsidian/plugins/obsidian-style-settings/data.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "ITS@@mini": false,
-  "ITS@@its-d": false,
-  "ITS@@accent-color": false,
-  "ITS@@notion": false,
-  "ITS@@canvas-cards": true,
-  "ITS@@select": "none",
-  "ITS@@nord": false,
-  "ITS@@drwn": true,
-  "ITS@@t-d": false,
-  "ITS@@s-d": false,
-  "ITS@@slrvb-g": false,
-  "ITS@@slrvb-b": false
-}
\ No newline at end of file