Conflict resolved the wrong way