Fix erroneous acceptance of merge conflict