Git Merge Conflict: Keep Both Files Instead of One - How to Handle Git Non Fast Forward Rejection-How to Stop Chrome from Crashing at Launch

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