changes to users model
solving conflicts