Resolve merge conflicts in workflow files, keeping origin/main versions
- deploy-to-server.yml: Keep secret validation step and ssh-keyscan fallback
- update-readme-bulletin.yml: Keep git push retry mechanism (3 attempts)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>