create users and fix sessions
fix merge conflict