Adding database model for user
Fixing merge conflict