add nav
fixed merge conflict