update css for nav.php
merge conflict