Correct merge conflict