Resolving Git Merge Conflicts Between Two Branches - How to Fix Firefox Secure Connection Failed Due to Antivirus-Resolve Git Non Fast-Forward Push Rejection

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.