Resolved merge conflict on style.css