fixes typo in nav
merge conflict fix