trying to fix merge issue

.obsidian/workspace.json

@@ -90,9 +90,23 @@
               "icon": "lucide-file",
               "title": "Trigonometri"
             }
+          },
+          {
+            "id": "fc32ad4cc63e1ba9",
+            "type": "leaf",
+            "state": {
+              "type": "split-diff-view",
+              "state": {
+                "aFile": ".obsidian/workspace.json",
+                "bFile": ".obsidian/workspace.json",
+                "aRef": ""
+              },
+              "icon": "diff",
+              "title": "Diff: workspace.json"
+            }
           }
         ],
-        "currentTab": 5
+        "currentTab": 4
       }
     ],
     "direction": "vertical"
@@ -149,7 +163,8 @@
       }
     ],
     "direction": "horizontal",
-    "width": 300
+    "width": 300,
+    "collapsed": true
   },
   "right": {
     "id": "b700e0cd0f882a5c",
@@ -213,13 +228,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Grafer.md",
+                "file": "Komplexa tal.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Outline of Grafer"
+              "title": "Outline of Komplexa tal"
             }
           },
           {
@@ -237,7 +252,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 200
+    "width": 343
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -251,15 +266,16 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "76c8d943958d45bf",
+  "active": "e616c86f78b96cf1",
   "lastOpenFiles": [
+    "Trigonometri.md",
+    "Komplexa tal.md",
     "Gräsvärde (1).md",
+    "conflict-files-obsidian-git.md",
     "gv1.png",
     "Funktioner.md",
     "Funktioner Forts.md",
-    "Komplexa tal.md",
     "Grafer.md",
-    "Trigonometri.md",
     "k2.png",
     "k1.png",
     "f_inverse.png",