diff --git a/public/assets/config-hello.json b/public/assets/config-hello.json
index 3c6c6b0..ce6dd68 100644
--- a/public/assets/config-hello.json
+++ b/public/assets/config-hello.json
@@ -1,6 +1,11 @@
 {
+<<<<<<< HEAD
   "heading": "bobot - 2024",
   "logo": "firebot.png",
+=======
+  "heading": "Crescendo - 2024",
+  "logo": "logo.png",
+>>>>>>> refs/remotes/origin/main
   "pages": [
     {
       "name": "Setup",