Some corrections to the text
Solve merge conflict