deleted header.php
added style
resolved merge conflict