Fix merge conflict correctly