rename Users model to User
merge update