fixing log in
fixing log in
conflict resolved