Fix small typo
Fixed merge issue. Fixed typos.