added background for login
resolve conflicts