applying the login functionality
fixing conflicts