diff --git a/ct/byparr.sh b/ct/byparr.sh
index cbd75c2c3..882bf8bca 100644
--- a/ct/byparr.sh
+++ b/ct/byparr.sh
@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
+<<<<<<< HEAD
 source <(curl -fsSL https://raw.githubusercontent.com/luismco/ProxmoxVED/refs/heads/byparr/misc/build.func)
 # Copyright (c) 2021-2025 community-scripts ORG
 # Author: luismco
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 # Source: https://github.com/Lissy93/web-check
+=======
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: luismco
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/ThePhaseless/Byparr
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 
 APP="Byparr"
 var_tags="${var_tags:-proxy}"
diff --git a/frontend/public/json/byparr.json b/frontend/public/json/byparr.json
new file mode 100644
index 000000000..57dc848ab
--- /dev/null
+++ b/frontend/public/json/byparr.json
@@ -0,0 +1,35 @@
+{
+  "name": "Byparr",
+  "slug": "byparr",
+  "categories": [
+    14
+  ],
+  "date_created": "2025-11-24",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 8191,
+  "documentation": "https://github.com/ThePhaseless/Byparr/blob/master/README.md",
+  "website": "https://github.com/ThePhaseless/Byparr",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/byparr.webp",
+  "config_path": "",
+  "description": "Byparr is a proxy server to bypass Cloudflare and DDoS-GUARD protection.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/byparr.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 2048,
+        "hdd": 4,
+        "os": "debian",
+        "version": "13"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": []
+}
diff --git a/install/byparr-install.sh b/install/byparr-install.sh
index ab16d97bc..6c39886cd 100644
--- a/install/byparr-install.sh
+++ b/install/byparr-install.sh
@@ -13,6 +13,20 @@ setting_up_container
 network_check
 update_os
 
+<<<<<<< HEAD
+=======
+msg_info "Installing Dependencies"
+$STD apt -y install \
+    xauth \
+    xvfb \
+    scrot \
+    curl \
+    chromium \
+    chromium-driver \
+    ca-certificates
+msg_ok "Installed Dependencies"
+
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 fetch_and_deploy_gh_release "Byparr" "ThePhaseless/Byparr"
 
 setup_uv
@@ -22,17 +36,34 @@ cat <<EOF >/etc/systemd/system/byparr.service
 [Unit]
 Description=Byparr
 After=network.target
+<<<<<<< HEAD
+=======
+
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 [Service]
 Type=simple
 WorkingDirectory=/opt/Byparr
 ExecStart=/usr/local/bin/uv run python3 main.py
 Restart=on-failure
 RestartSec=10
+<<<<<<< HEAD
 [Install]
 WantedBy=multi-user.target
 EOF
 systemctl enable -q --now byparr
+=======
+
+[Install]
+WantedBy=multi-user.target
+EOF
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 msg_ok "Created Service"
 
 motd_ssh
 customize
+<<<<<<< HEAD
+=======
+cleanup_lxc
+
+systemctl enable -q --now byparr
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
diff --git a/misc/build.func b/misc/build.func
index 38a1095af..cb133e6fb 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -2816,6 +2816,7 @@ EOF'
   install_ssh_keys_into_ct
 
   # Run application installer
+<<<<<<< HEAD
 <<<<<<< HEAD
   # NOTE: We disable error handling here because:
   # 1. Container errors are caught by error_handler INSIDE container
@@ -2862,6 +2863,11 @@ EOF'
     local build_log_copied=false
     local install_log_copied=false
 
+=======
+  if ! lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/luismco/ProxmoxVED/refs/heads/byparr/install/${var_install}.sh)"; then
+    local exit_code=$?
+    # Try to copy installation log from container before exiting
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
     if [[ -n "$CTID" && -n "${SESSION_ID:-}" ]]; then
       # Copy BUILD_LOG (creation log) if it exists
       if [[ -f "${BUILD_LOG}" ]]; then
diff --git a/misc/install.func b/misc/install.func
index ffcf912ea..34bf1513f 100644
--- a/misc/install.func
+++ b/misc/install.func
@@ -183,6 +183,7 @@ else
   echo -n "DIRECT"
 fi
 EOF
+<<<<<<< HEAD
 <<<<<<< HEAD
     chmod +x /usr/local/bin/apt-proxy-detect.sh
   fi
@@ -192,6 +193,8 @@ EOF
   msg_ok "Updated Container OS"
   source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/tools.func)
 =======
+=======
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
         chmod +x /usr/local/bin/apt-proxy-detect.sh
     fi
     $STD apt-get update
@@ -199,7 +202,10 @@ EOF
     rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
     msg_ok "Updated Container OS"
     source <(curl -fsSL https://raw.githubusercontent.com/luismco/ProxmoxVED/refs/heads/byparr/misc/tools.func)
+<<<<<<< HEAD
 >>>>>>> 1b856490 (Added install and ct files)
+=======
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 }
 
 # ==============================================================================
@@ -274,6 +280,7 @@ customize() {
   ExecStart=
   ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
 EOF
+<<<<<<< HEAD
 <<<<<<< HEAD
     systemctl daemon-reload
     systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
@@ -288,6 +295,8 @@ EOF
     chmod 600 /root/.ssh/authorized_keys
   fi
 =======
+=======
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
         systemctl daemon-reload
         systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
         msg_ok "Customized Container"
@@ -300,5 +309,8 @@ EOF
         chmod 700 /root/.ssh
         chmod 600 /root/.ssh/authorized_keys
     fi
+<<<<<<< HEAD
 >>>>>>> 1b856490 (Added install and ct files)
+=======
+>>>>>>> 705b0b3ed245a44466c93f68bc8f966962c11eee
 }