Fix Git 'index.lock file exists' Error - Resolving Package Conflicts in Pipenv Environments-Handling Merge Conflicts After Git Stash

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