fixed merge conflict
merged the user model/migration
Added user model association, integration tests pass