Fix merging error

.config/kak/kakrc

@@ -1,4 +1,4 @@
-colorscheme gotham
+colorscheme default
 set-option global tabstop 3
 set-option global aligntab true
 add-highlighter global/ number-lines

.config/qutebrowser/autoconfig.yml

@@ -19,6 +19,7 @@ settings:
     '*://*.pixelfed.org/*': true
     '*://*.pixelfed.social/*': true
     '*://*.reddit.com/*': true
+    '*://*.trolliet.info/*': true
     '*://*.twitter.com/*': true
     '*://*.www.meteosuisse.admin.ch/*': true
     '*://*.www.openstreetmap.org/*': true

.config/qutebrowser/quickmarks

@@ -30,6 +30,9 @@ rich comparator 10% https://howrichami.givingwhatwecan.org/how-rich-am-i
 opengraph image size facebook twitter og https://iamturns.com/open-graph-image-size
 inubo nextcloud files https://www.inubo.ch/apps/files/?dir=/&fileid=1238980
 password generator https://passwordsgenerator.net/
+leftvalues quiz values left politic https://leftvalues.github.io/
+canard réfractaire peertube https://canard.tube/accounts/yohan/video-channels
+8values quiz political https://8values.github.io/index.html
 lorem picsum picture https://picsum.photos/
 webmail cmnet acg https://webmail.acg-geneve.ch/lm_auth_proxy?DoLMLogin?curl=L2f&curlid=3772153266-622203423
 infokiosques bibliothèque livres anarchisme féminisme https://infokiosques.net/