correct merge conflict