First commit
Resolved merge conflicts