Fix Nginx Permission Denied on Socket File - Resolving 'index.lock file exists' in Git on macOS-How to See What Changed During a Git Merge Conflict

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