Warren food_info.php conflicts cleared