Fixed spelling, grammar and typos
Solved conflict and fixed grammar and typos