typos
Small Typos
Merge conflict resolved (?)