Updated HTML
Resolved merge conflicts