user model
fix db conflicts