diff --git a/ct/wanderer.sh b/ct/wanderer.sh
index aeab341026b..1691d59e342 100644
--- a/ct/wanderer.sh
+++ b/ct/wanderer.sh
@@ -6,7 +6,19 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
 # Source: https://wanderer.to
 
 APP="Wanderer"
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 var_tags="${var_tags:-travelling;sport}"
+=======
+var_tags="${var_tags:-traveling;sport}"
+>>>>>>> 056b67a21 ('Add new script')
+=======
+var_tags="${var_tags:-travelling;sport}"
+>>>>>>> a516bb7f5 (refactor)
+=======
+var_tags="${var_tags:-travelling;sport}"
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-4096}"
 var_disk="${var_disk:-8}"
@@ -30,9 +42,27 @@ function update_script() {
     fi
 
     if check_for_gh_release "wanderer" "Flomp/wanderer"; then
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+        msg_info "Stopping service"
+        systemctl stop wanderer-web
+        msg_ok "Stopped service"
+=======
+        msg_info "Stopping wanderer service"
+        systemctl stop wanderer-web
+        msg_ok "Stopped wanderer service"
+>>>>>>> 056b67a21 ('Add new script')
+=======
         msg_info "Stopping service"
         systemctl stop wanderer-web
         msg_ok "Stopped service"
+>>>>>>> a516bb7f5 (refactor)
+=======
+        msg_info "Stopping service"
+        systemctl stop wanderer-web
+        msg_ok "Stopped service"
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
         
 				fetch_and_deploy_gh_release "wanderer" "Flomp/wanderer"  "tarball" "latest" "/opt/wanderer/source"
 				
@@ -45,7 +75,32 @@ function update_script() {
         $STD npm run build
         msg_ok "Updated wanderer"
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
+        msg_info "Starting service"
+        systemctl start wanderer-web
+        msg_ok "Started service"
+        msg_ok "Update Successful"
+    fi
+    if check_for_gh_release "meilisearch" "meilisearch/meilisearch"; then
+        msg_info "Stopping service"
+        systemctl stop wanderer-web
+        msg_ok "Stopped service"
+
+    		fetch_and_deploy_gh_release "meilisearch" "meilisearch/meilisearch" "binary" "latest" "/opt/wanderer/source/search"
+
+        msg_info "Starting service"
+        systemctl start wanderer-web
+        msg_ok "Started service"
+<<<<<<< HEAD
+=======
+        msg_info "Starting wanderer service"
+=======
         msg_info "Starting service"
+>>>>>>> a516bb7f5 (refactor)
         systemctl start wanderer-web
         msg_ok "Started service"
         msg_ok "Update Successful"
@@ -59,7 +114,14 @@ function update_script() {
 
         msg_info "Starting service"
         systemctl start wanderer-web
+<<<<<<< HEAD
+        msg_ok "Started wanderer service"
+>>>>>>> 056b67a21 ('Add new script')
+=======
         msg_ok "Started service"
+>>>>>>> a516bb7f5 (refactor)
+=======
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
         msg_ok "Update Successful"
     fi
     exit
diff --git a/frontend/public/json/wanderer.json b/frontend/public/json/wanderer.json
index 1d693d1b300..7792d045aad 100644
--- a/frontend/public/json/wanderer.json
+++ b/frontend/public/json/wanderer.json
@@ -1,4 +1,6 @@
 {
+<<<<<<< HEAD
+<<<<<<< HEAD
   "name": "Wanderer",
   "slug": "wanderer",
   "categories": [
@@ -32,4 +34,44 @@
     "password": null
   },
   "notes": []
+=======
+=======
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
+    "name": "Wanderer",
+    "slug": "wanderer",
+    "categories": [
+        24
+    ],
+    "date_created": "2025-11-23",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "config_path": "/opt/wanderer/.env",
+    "interface_port": 3000,
+    "documentation": "https://wanderer.to/welcome",
+    "website": "https://wanderer.to",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@master/webp/wanderer-light.webp",
+    "description": "Wanderer is a decentralized, self-hosted trail database. You can upload your recorded GPS tracks or create new ones and add various metadata to build an easily searchable catalogue.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/wanderer.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 4096,
+                "hdd": 8,
+                "os": "debian",
+                "version": "13"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": []
+<<<<<<< HEAD
+>>>>>>> 056b67a21 ('Add new script')
+=======
+>>>>>>> f5a3c3793275c0937fca7f8784b5a2b3ce83997f
 }