header.php

resolve conflict