CHOCOLATE
resolved chocolate conflict