updating login
fixing conflicts