fix: replace git merge --ff-only with git reset --hard to avoid package-lock.json conflicts

Author: ddrayko

.github/workflows/deploy-beta.yml

@@ -20,7 +20,7 @@ jobs:
             cp .env /tmp/beta.env 2>/dev/null; cp port.txt /tmp/beta.port.txt 2>/dev/null
             git fetch origin --prune
             git checkout beta
-            git merge --ff-only origin/beta
+            git reset --hard origin/beta
             cp /tmp/beta.env .env 2>/dev/null; cp /tmp/beta.port.txt port.txt 2>/dev/null
             grep 'discord.zero-host.org' public/js/app.js || echo "⚠ DISCORD LINK NOT FOUND IN FILE"
             head -20 port.txt 2>/dev/null || echo "⚠ port.txt missing or empty"

.github/workflows/deploy-main.yml

@@ -20,7 +20,7 @@ jobs:
             cp .env /tmp/main.env 2>/dev/null; cp port.txt /tmp/main.port.txt 2>/dev/null
             git fetch origin --prune
             git checkout main
-            git merge --ff-only origin/main
+            git reset --hard origin/main
             cp /tmp/main.env .env 2>/dev/null; cp /tmp/main.port.txt port.txt 2>/dev/null
             npm install
             pm2 restart zerohost-dashboard