fixing login
resolve conflicts