fixing merge conflict typos