fixed login
solved conflict