Small Typos
Merge conflict resolved (?)