oops… cleaned up merge conflict in header.php