Created User object into the database
Fixed merge conflicts
Fixed merge conflicts