adding plan
comment on the user model
solving merge