What happens when two branches change the same lines of the same file and Git can't tell which version to keep. Git pauses the merge and marks the spot so you can open the file, decide on the final text, and finish the merge yourself.