Resolving Git Merge Conflicts Between Two Branches - Fix Git Merge Conflicts with Deleted Files-Fix 'git remote origin already exists' Error on Mac

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.