Fix user logged in
Fix conflict