typo fixup
merge resolution