generated user model and migrations
remove conflicts