login almost finished
fixed conflict in controller