resolve conflicts/fix "u r not log in"