Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -4,6 +4,7 @@ namespace Drupal\search_api\Plugin\search_api\processor;
@@ -656,7 +657,8 @@ class Highlight extends ProcessorPluginBase implements PluginFormInterface {