Made a few edits.
Fixing merge conflicts