Fix Git Merge Conflicts When Stash Changes Are Involved - How to Solve Nginx Config File Permission Denied-Resolving 'Unable to Create index.lock' in Git

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