The core idea

A conflict is a question, not a break.

Git hit two changes to the same lines and can't safely choose. It pauses and asks you to decide. Nothing is broken.