the model user can be edit after is created
commit merge conflict solved