Initial commit
Resolved merge conflicts