Minor edits
Resolved merge conflicts