If there are versions of a file with different changes in branches we want to merge, we'll face a conflict that we need to resolve.

See that? Both branches have modified cookie.txt. If we try to merge the branches, we'll see a conflict.