Fix Chrome Slow and High Memory Usage - Handling Git Merge Conflicts in Lockfiles-Git Merge Conflict: How to Keep Both Versions of a File

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