Integrate users and sessions
Fix merge issues