Drink approval code
Fixed merge conflicts