fixing typos
merge resolve