Updated Merged Conflict

Update merged conflict :
- header.php (menu bar)