fixed login bug
fixed conflicts