Small changes.
Resolved merge conflicts