Now that we've located the merge conflict, how can we resolve it?

Decide which version we want to keepOpen a text editor and delete the other version along with the special markingsCommit the file

Great! Because Git doesn't know which version of the file it should keep, we have to decide, delete everything we don't need, and commit the file.

Might it be the we need to make a decision before deleting the other version and committing the file?