fix merge conflicts
fix merge conflicts

CorainChicago/ChicagoDonutClub,CorainChicago/DonutDatabase,CorainChicago/DonutDatabase,CorainChicago/ChicagoDonutClub,CorainChicago/ChicagoDonutClub,CorainChicago/DonutDatabase