diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 79c0110..902ebb2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="d89ddef3-0f6b-45b8-91d4-ca4b15835330" name="Changes" comment="Comment out all footer" />
+=======
+    <list default="true" id="d89ddef3-0f6b-45b8-91d4-ca4b15835330" name="Changes" comment="Comment out all footer">
+      <change beforePath="$PROJECT_DIR$/content/.obsidian/appearance.json" beforeDir="false" afterPath="$PROJECT_DIR$/content/.obsidian/appearance.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/.obsidian/workspace.json" beforeDir="false" afterPath="$PROJECT_DIR$/content/.obsidian/workspace.json" afterDir="false" />
+    </list>
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -62,9 +69,12 @@
   "keyToStringList": {
     "DatabaseDriversLRU": [
       "sqlite"
+<<<<<<< HEAD
     ],
     "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
       "Python"
+=======
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
     ]
   }
 }]]></component>
@@ -99,7 +109,11 @@
       <workItem from="1763368336948" duration="74000" />
       <workItem from="1763468129001" duration="1460000" />
       <workItem from="1763591031608" duration="2000" />
+<<<<<<< HEAD
       <workItem from="1763668772985" duration="4190000" />
+=======
+      <workItem from="1763668772985" duration="3531000" />
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
     </task>
     <task id="LOCAL−00001" summary="Update">
       <option name="closed" value="true" />
diff --git a/content/.obsidian/workspace.json b/content/.obsidian/workspace.json
index ccb79e9..b64f4fb 100644
--- a/content/.obsidian/workspace.json
+++ b/content/.obsidian/workspace.json
@@ -12,10 +12,21 @@
             "id": "6be8a23612495802",
             "type": "leaf",
             "state": {
+<<<<<<< HEAD
               "type": "empty",
               "state": {},
               "icon": "lucide-file",
               "title": "New tab"
+=======
+              "type": "markdown",
+              "state": {
+                "file": "Biokemi/Cellulära processer/Kromatin/Stoff.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Stoff"
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
             }
           }
         ]
@@ -71,7 +82,11 @@
             "state": {
               "type": "search",
               "state": {
+<<<<<<< HEAD
                 "query": "",
+=======
+                "query": "heterokromatin",
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -92,11 +107,20 @@
               "title": "Bookmarks"
             }
           }
+<<<<<<< HEAD
         ]
       }
     ],
     "direction": "horizontal",
     "width": 345.5024719238281
+=======
+        ],
+        "currentTab": 1
+      }
+    ],
+    "direction": "horizontal",
+    "width": 285.5024719238281
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
   },
   "right": {
     "id": "0948c66181b40af9",
@@ -198,6 +222,7 @@
       "obsidian-git:Open Git source control": false
     }
   },
+<<<<<<< HEAD
   "active": "10341d1503d8d1c5",
   "lastOpenFiles": [
     "attachments/Pasted image 20251027205207.png",
@@ -211,6 +236,10 @@
     "Instuderingsfrågor/1.2 Hjärta och cirkulation.md",
     "Instuderingsfrågor/1.1 Rörelseapparaten.md",
     "Instuderingsfrågor",
+=======
+  "active": "6be8a23612495802",
+  "lastOpenFiles": [
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
     "Biokemi/Metabolism/Termodynamik/Thermodynamik_MO-5.pdf",
     "Biokemi/Metabolism/Termodynamik/Instuderingsfrågor termodynamik-4.pdf",
     "Biokemi/Metabolism/Termodynamik/Biochemistry 10th edition kap 5.1.pdf",
@@ -219,6 +248,7 @@
     "Biokemi/Metabolism/Enzymer/Instuderingsfrågor enzymer-3.pdf",
     "Biokemi/Metabolism/Enzymer/Enzymer_2_MO-6.pdf",
     "Biokemi/Metabolism/Enzymer/Enzymer_1_MO-6.pdf",
+<<<<<<< HEAD
     "Biokemi/Lipider/index.md",
     "Biokemi/Kemisk binding och biologiska makromolekyler/van der Waals krafter.md",
     "Biokemi/Kemisk binding och biologiska makromolekyler/index.md",
@@ -237,6 +267,38 @@
     "Biokemi/Cellulära processer/Kromatin/Instuderingsfrågor.md",
     "Biokemi/Cellulära processer/DNA replikation/Instuderingsfrågor.md",
     "Biokemi/Cellulära processer/Kromatin/Stoff.md",
+=======
+    "Biokemi/Metabolism/Enzymer/Biochemistry 10th edition Kap 5-6.pdf",
+    "Biokemi/Cellulära processer/DNA replikation/Instuderingsfrågor_DNA replikation-5.pdf",
+    "Biokemi/Cellulära processer/DNA replikation/DNA replikation_V2025-2.pdf",
+    "Biokemi/index.md",
+    "Biokemi/Cellulära processer/RNA syntes/Chapter 29 RNA Functions, Biosynthesis, and Processing.md",
+    "Biokemi/Cellulära processer/Kromatin/Chapter 29 RNA Functions, Biosynthesis, and Processing.md",
+    "attachments/Pasted image 20251027205207.png",
+    "attachments/Pasted image 20251027185923.png",
+    "Studieteknik/Minnespalats.md",
+    "Målbeskrivning/Plan.md",
+    "Målbeskrivning/Alla mål.md",
+    "Instuderingsfrågor/index.md",
+    "Instuderingsfrågor/Zoom meeting.md",
+    "Instuderingsfrågor/1.2 Hjärta och cirkulation.md",
+    "Instuderingsfrågor/1.1 Rörelseapparaten.md",
+    "Anatomi & Histologi/Histologi/Brosk/Perikondrium.md",
+    "Anatomi & Histologi/Histologi/Brosk/Kondroprogenitor.md",
+    "Anatomi & Histologi/Histologi/Brosk/Kondroblast.md",
+    "Anatomi & Histologi/Histologi/Brosk/Hyalint Brosk.md",
+    "Anatomi & Histologi/Histologi/index.md",
+    "Biokemi/Cellulära processer/DNA replikation/Anteckningar.md",
+    "Biokemi/Cellulära processer/DNA replikation/Provfrågor.md",
+    "Biokemi/Cellulära processer/Initiering och terminering av DNA replikation/Provfrågor.md",
+    "Biokemi/Cellulära processer/Initiering och terminering av DNA replikation/Instuderingsfrågor.md",
+    "Biokemi/Cellulära processer/Initiering och terminering av DNA replikation/Lärandemål.md",
+    "Biokemi/Cellulära processer/DNA replikation/Stoff.md",
+    "Biokemi/Cellulära processer/RNA syntes/Stoff.md",
+    "Biokemi/Cellulära processer/DNA replikation/Lärandemål.md",
+    "Biokemi/Cellulära processer/DNA replikation/Instuderingsfrågor.md",
+    "Biokemi/Cellulära processer/Initiering och terminering av DNA replikation/Anteckningar.md",
+>>>>>>> 210240c (vault backup: 2025-11-22 12:21:17)
     "attachments/Pasted image 20251121114559.png",
     "attachments/Pasted image 20251121114507.png",
     "attachments/Pasted image 20251121114215.png",