user model
create model
fixed merge conflict