diff --git a/config/settings_data.json b/config/settings_data.json
index e0b057d..a161a8d 100644
--- a/config/settings_data.json
+++ b/config/settings_data.json
@@ -11,8 +11,14 @@
   "current": {
     "logo": "shopify://shop_images/Shinnex.webp",
     "logo_width": 150,
+<<<<<<< HEAD
     "favicon": "shopify://shop_images/Favicon.svg",
     "shx_logo2": "shopify://shop_images/ShinnexFiguren.webp",
+=======
+    "favicon": "shopify:\/\/shop_images\/Favicon.svg",
+    "shx_logo2": "shopify:\/\/shop_images\/ShinnexFiguren.webp",
+    "shx_logo2_width": 150,
+>>>>>>> 403cf36b8e0e4b3eaa92393f794ccb68318e9155
     "type_header_font": "assistant_n4",
     "heading_scale": 100,
     "type_body_font": "assistant_n4",