Users model fix
fix merge conflict