diff --git a/notes/.obsidian/appearance.json b/notes/.obsidian/appearance.json
index 1621374..6e51554 100644
--- a/notes/.obsidian/appearance.json
+++ b/notes/.obsidian/appearance.json
@@ -1,5 +1,5 @@
 {
-  "baseFontSize": 15,
+  "baseFontSize": 17,
   "theme": "obsidian",
   "cssTheme": "Atom"
 }
\ No newline at end of file
diff --git a/notes/.obsidian/graph.json b/notes/.obsidian/graph.json
index fa7dff5..1ee6f6a 100644
--- a/notes/.obsidian/graph.json
+++ b/notes/.obsidian/graph.json
@@ -95,6 +95,6 @@
   "repelStrength": 10.2352941176471,
   "linkStrength": 0.458823529411765,
   "linkDistance": 240,
-  "scale": 0.5104915489851998,
+  "scale": 0.2597186430339871,
   "close": true
 }
\ No newline at end of file
diff --git a/notes/.obsidian/plugins/obsidian-activity-history/data.json b/notes/.obsidian/plugins/obsidian-activity-history/data.json
index 9218617..ba9e61c 100644
--- a/notes/.obsidian/plugins/obsidian-activity-history/data.json
+++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json
@@ -12,24 +12,302 @@
   "checkpointList": [
     {
       "path": "/",
+<<<<<<< HEAD
       "date": "2022-01-14",
       "size": 706190
+=======
+      "date": "2022-01-12",
+      "size": 723413
+>>>>>>> 45d9c03374d40eeb603c4fd0db73615cded8a7b4
     }
   ],
   "activityHistory": [
     {
       "path": "/",
       "size": [
+        {
+          "date": "2021-09-11",
+          "value": 881
+        },
+        {
+          "date": "2021-09-12",
+          "value": 117
+        },
+        {
+          "date": "2021-09-13",
+          "value": 1256
+        },
+        {
+          "date": "2021-09-14",
+          "value": 2350
+        },
+        {
+          "date": "2021-09-15",
+          "value": 2658
+        },
+        {
+          "date": "2021-09-16",
+          "value": 2379
+        },
+        {
+          "date": "2021-09-17",
+          "value": 2958
+        },
+        {
+          "date": "2021-09-20",
+          "value": 3532
+        },
+        {
+          "date": "2021-09-21",
+          "value": 504
+        },
+        {
+          "date": "2021-09-22",
+          "value": 1326
+        },
+        {
+          "date": "2021-09-23",
+          "value": 1170
+        },
+        {
+          "date": "2021-09-24",
+          "value": 2420
+        },
+        {
+          "date": "2021-09-29",
+          "value": 2117
+        },
+        {
+          "date": "2021-09-30",
+          "value": 3672
+        },
+        {
+          "date": "2021-10-01",
+          "value": 4392
+        },
+        {
+          "date": "2021-10-04",
+          "value": 3088
+        },
+        {
+          "date": "2021-10-05",
+          "value": 0
+        },
+        {
+          "date": "2021-10-06",
+          "value": 0
+        },
+        {
+          "date": "2021-10-10",
+          "value": 4296
+        },
+        {
+          "date": "2021-10-11",
+          "value": 2247
+        },
+        {
+          "date": "2021-10-12",
+          "value": 0
+        },
+        {
+          "date": "2021-10-13",
+          "value": 321
+        },
+        {
+          "date": "2021-10-14",
+          "value": 1265
+        },
+        {
+          "date": "2021-10-15",
+          "value": 2347
+        },
+        {
+          "date": "2021-10-19",
+          "value": 1661
+        },
+        {
+          "date": "2021-10-21",
+          "value": 12918
+        },
+        {
+          "date": "2021-10-22",
+          "value": 12
+        },
+        {
+          "date": "2021-10-23",
+          "value": 0
+        },
+        {
+          "date": "2021-10-24",
+          "value": 0
+        },
+        {
+          "date": "2021-10-25",
+          "value": 140
+        },
+        {
+          "date": "2021-11-01",
+          "value": 16800
+        },
+        {
+          "date": "2021-11-02",
+          "value": 0
+        },
+        {
+          "date": "2021-11-04",
+          "value": 112719
+        },
+        {
+          "date": "2021-11-05",
+          "value": 1875
+        },
+        {
+          "date": "2021-11-06",
+          "value": 0
+        },
+        {
+          "date": "2021-11-07",
+          "value": 1870
+        },
+        {
+          "date": "2021-11-08",
+          "value": 6153
+        },
+        {
+          "date": "2021-11-12",
+          "value": 6702
+        },
+        {
+          "date": "2021-11-15",
+          "value": 322
+        },
+        {
+          "date": "2021-11-16",
+          "value": 0
+        },
+        {
+          "date": "2021-11-18",
+          "value": 1515
+        },
+        {
+          "date": "2021-11-19",
+          "value": 60229
+        },
+        {
+          "date": "2021-11-20",
+          "value": 303
+        },
+        {
+          "date": "2021-11-21",
+          "value": 0
+        },
+        {
+          "date": "2021-11-23",
+          "value": 2470
+        },
+        {
+          "date": "2021-11-24",
+          "value": 3475
+        },
+        {
+          "date": "2021-11-25",
+          "value": 1703
+        },
+        {
+          "date": "2021-11-26",
+          "value": 345395
+        },
+        {
+          "date": "2021-11-29",
+          "value": 0
+        },
+        {
+          "date": "2021-11-30",
+          "value": 472
+        },
+        {
+          "date": "2021-12-01",
+          "value": 0
+        },
+        {
+          "date": "2021-12-02",
+          "value": 1397
+        },
+        {
+          "date": "2021-12-03",
+          "value": 10913
+        },
+        {
+          "date": "2021-12-04",
+          "value": 0
+        },
+        {
+          "date": "2021-12-06",
+          "value": 2982
+        },
+        {
+          "date": "2021-12-07",
+          "value": 385
+        },
+        {
+          "date": "2021-12-08",
+          "value": 966
+        },
+        {
+          "date": "2021-12-09",
+          "value": 2868
+        },
+        {
+          "date": "2021-12-10",
+          "value": 4093
+        },
+        {
+          "date": "2021-12-11",
+          "value": 0
+        },
+        {
+          "date": "2021-12-14",
+          "value": 1406
+        },
+        {
+          "date": "2021-12-15",
+          "value": 3717
+        },
+        {
+          "date": "2021-12-16",
+          "value": 773
+        },
+        {
+          "date": "2021-12-17",
+          "value": 1071
+        },
+        {
+          "date": "2021-12-22",
+          "value": 4638
+        },
+        {
+          "date": "2022-01-03",
+          "value": 20913
+        },
+        {
+          "date": "2022-01-05",
+          "value": 12358
+        },
         {
           "date": "2022-01-07",
           "value": 120244
         },
+        {
+          "date": "2022-01-10",
+          "value": 28643
+        },
         {
           "date": "2022-01-11",
-          "value": 7492
+          "value": 72427
         },
         {
           "date": "2022-01-12",
+<<<<<<< HEAD
           "value": 69078
         },
         {
@@ -39,6 +317,9 @@
         {
           "date": "2022-01-14",
           "value": 1465
+=======
+          "value": 6302
+>>>>>>> 45d9c03374d40eeb603c4fd0db73615cded8a7b4
         }
       ]
     }
diff --git a/notes/Excalidraw/Excalidraw.md b/notes/Excalidraw/Excalidraw.md
index b450c02..a282309 100644
--- a/notes/Excalidraw/Excalidraw.md
+++ b/notes/Excalidraw/Excalidraw.md
@@ -1,4 +1,9 @@
 # Excalidraw
+
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[Excalidraw/Rezistor-example1.excalidraw|Rezistor-example1.excalidraw]]
 -  [[Excalidraw/tek-preruseni-jedna.excalidraw|tek-preruseni-jedna.excalidraw]]
diff --git a/notes/cjl/Slohové práce/Slohové práce.md b/notes/cjl/Slohové práce/Slohové práce.md
index 828ce76..2ef8297 100644
--- a/notes/cjl/Slohové práce/Slohové práce.md	
+++ b/notes/cjl/Slohové práce/Slohové práce.md	
@@ -2,6 +2,10 @@
 tags: [MOC, generated, cjl, cjl/sloh]
 ---
 # Slohové práce
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/Slohové práce/Dějová linka|Dějová linka]]
 -  [[cjl/Slohové práce/Postavy|Postavy]]
diff --git a/notes/cjl/jazyky/jazyky.md b/notes/cjl/jazyky/jazyky.md
index 77d39ba..439b20d 100644
--- a/notes/cjl/jazyky/jazyky.md
+++ b/notes/cjl/jazyky/jazyky.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, index, cjl]
 ---
 # jazyky
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/jazyky/Český jazyk|Český jazyk]]
 -  [[cjl/jazyky/Polština|Polština]]
diff --git a/notes/cjl/literatura/Cizí literatura/Cizí literatura.md b/notes/cjl/literatura/Cizí literatura/Cizí literatura.md
index 83feff3..41507a2 100644
--- a/notes/cjl/literatura/Cizí literatura/Cizí literatura.md	
+++ b/notes/cjl/literatura/Cizí literatura/Cizí literatura.md	
@@ -2,6 +2,10 @@
 tags: [MOC, cjl, cjl/literatura, generated, index]
 ---
 # Cizí literatura
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/literatura/Cizí literatura/Arabská literatura|Arabská literatura]]
 -  [[cjl/literatura/Cizí literatura/Čínská literatura|Čínská literatura]]
diff --git a/notes/cjl/literatura/Hebrejská literatura/Hebrejská literatura.md b/notes/cjl/literatura/Hebrejská literatura/Hebrejská literatura.md
index c2dac58..3f4efb9 100644
--- a/notes/cjl/literatura/Hebrejská literatura/Hebrejská literatura.md	
+++ b/notes/cjl/literatura/Hebrejská literatura/Hebrejská literatura.md	
@@ -2,6 +2,10 @@
 tags: [MOC, README, generated, cjl]
 ---
 # Hebrejská literatura
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/literatura/Hebrejská literatura/Bible|Bible]]
 %% Zoottelkeeper: End of the autogenerated index file list  %%
diff --git a/notes/cjl/literatura/Řecká literatura/Řecká literatura.md b/notes/cjl/literatura/Řecká literatura/Řecká literatura.md
index 10574cc..2640fb8 100644
--- a/notes/cjl/literatura/Řecká literatura/Řecká literatura.md	
+++ b/notes/cjl/literatura/Řecká literatura/Řecká literatura.md	
@@ -2,6 +2,10 @@
 tags: [cjl, MOC]
 ---
 # Řecká literatura
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/literatura/Řecká literatura/Období|Období]]
 -  [[cjl/literatura/Řecká literatura/Ukázky|Ukázky]]
diff --git a/notes/ech/Názvosloví/Názvosloví.md b/notes/ech/Názvosloví/Názvosloví.md
index cbda093..322e588 100644
--- a/notes/ech/Názvosloví/Názvosloví.md
+++ b/notes/ech/Názvosloví/Názvosloví.md
@@ -2,6 +2,10 @@
 tags: [MOC, ech, generated, index]
 ---
 # Názvosloví
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[ech/Názvosloví/Bezkyslíkaté kyseliny|Bezkyslíkaté kyseliny]]
 -  [[ech/Názvosloví/Hydroxidy|Hydroxidy]]
diff --git a/notes/ech/Prvky/Prvky.md b/notes/ech/Prvky/Prvky.md
index 08cadae..e6cdcd7 100644
--- a/notes/ech/Prvky/Prvky.md
+++ b/notes/ech/Prvky/Prvky.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, index, ech, ech/prvky]
 ---
 # Prvky
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[ech/Prvky/Kyslík|Kyslík]]
 -  [[ech/Prvky/Vodík|Vodík]]
diff --git a/notes/fyz/pohyb/pohyb.md b/notes/fyz/pohyb/pohyb.md
index 81c5fc0..d4bd79d 100644
--- a/notes/fyz/pohyb/pohyb.md
+++ b/notes/fyz/pohyb/pohyb.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, index, fyz]
 ---
 # pohyb
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[fyz/pohyb/Druhý pohybový zákon|Druhý pohybový zákon]]
 -  [[fyz/pohyb/Hybnost tělesa|Hybnost tělesa]]
diff --git a/notes/kbb/kbb.md b/notes/kbb/kbb.md
index 6175fc1..50b0e94 100644
--- a/notes/kbb/kbb.md
+++ b/notes/kbb/kbb.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, index, kbb]
 ---
 # kbb
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[kbb/haxagon/haxagon|haxagon]]
 -  [[kbb/tools/tools|tools]]
diff --git a/notes/mat/Výroky/Výroky.md b/notes/mat/Výroky/Výroky.md
index a15ea94..7c74468 100644
--- a/notes/mat/Výroky/Výroky.md
+++ b/notes/mat/Výroky/Výroky.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, idnex, mat]
 ---
 # Výroky
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[mat/Výroky/Kvantifikované výroky|Kvantifikované výroky]]
 -  [[mat/Výroky/Příklady|Příklady]]
diff --git a/notes/notes.md b/notes/notes.md
index 8c1a68d..38eee72 100644
--- a/notes/notes.md
+++ b/notes/notes.md
@@ -7,6 +7,7 @@ noteOnly: true
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[ang/ang|ang]]
 -  [[cjl/cjl|cjl]]
+-  [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
 -  [[data/data|data]]
 -  [[dej/dej|dej]]
 -  [[ech/ech|ech]]
diff --git a/notes/projects/arcade/arcade.md b/notes/projects/arcade/arcade.md
index 55b0a16..76b17b4 100644
--- a/notes/projects/arcade/arcade.md
+++ b/notes/projects/arcade/arcade.md
@@ -1,4 +1,8 @@
 # arcade
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[projects/arcade/Menu|Menu]]
 -  [[projects/arcade/Tech|Tech]]
diff --git a/notes/projects/projects.md b/notes/projects/projects.md
index f463e84..ec69bc6 100644
--- a/notes/projects/projects.md
+++ b/notes/projects/projects.md
@@ -1,4 +1,8 @@
 # projects
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[projects/arcade/arcade|arcade]]
 %% Zoottelkeeper: End of the autogenerated index file list  %%
diff --git a/notes/tek/tek.md b/notes/tek/tek.md
index e031601..8157d02 100644
--- a/notes/tek/tek.md
+++ b/notes/tek/tek.md
@@ -2,6 +2,10 @@
 tags: [MOC, generated, index, tek]
 ---
 # tek
+```ccard
+type: folder_brief_live
+imagePrefix: 'data/'
+```
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[tek/Kótování koule|Kótování koule]]
 -  [[tek/Kótování na strojařský výkres|Kótování na strojařský výkres]]