fix missing changes after a merge conflict