Some great edits.
resolved conflict