Modify user database and login model
Merge conflicts
Modified user db