Fixing login screen
fixed conflicts