Navigation...

Updated the Navigation.php to remove the information added by git merge