Disable surround for vinegar conflict