fix users model
fix conflict on merge