creating login
fixing conflicts