add login_in nav
fix merge conficts