diff --git a/.config/zim/style.conf b/.config/zim/style.conf
index 109f17c..20e1c84 100644
--- a/.config/zim/style.conf
+++ b/.config/zim/style.conf
@@ -4,7 +4,11 @@ indent=30
 tabs=None
 linespacing=3
 wrapped-lines-linespacing=0
+<<<<<<< Updated upstream
 font=FuraCode Nerd Font Mono weight=450 14
+=======
+font=.AppleSystemUIFont 17
+>>>>>>> Stashed changes
 justify=
 background=#cccccc
 
@@ -32,7 +36,6 @@ wrap-mode=GTK_WRAP_NONE
 indent=20
 
 [Tag link]
-foreground=#8cd3ff
 
 [Tag tag]
 foreground=#ce5c00