Ready to submit version
Resolved merge conflicts