Typos
Merging