Daily Prompt: 2026-06-24

How do you handle merge conflicts that are completely your fault?