database update for breweries
fixed merge conflicts