navigator, login
fixing conflicts