completed nav
fix merge conficts