update nav
merge diff