Re-enter merlot and add country and grape to missing white

Redundant `self` detected.