Fix typos in doc
Fix conflicts