fix typos in last merge conflict resolutions