user login message fix
solving merge conflicts
solving merge conflicts