correct faulty merge conflict resolution