fixed merge conflict

CRM/DataprocessorOutputExport/CSV.php

CRM/DataprocessorSearch/Controller/ParticipantSearch.php

CRM/DataprocessorSearch/Form/ParticipantSearch.php

CRM/DataprocessorSearch/ParticipantSearch.php

CRM/DataprocessorSearch/StateMachine/ParticipantSearch.php

...aProcessor/DataSpecification/CustomFieldSpecification.php

Civi/DataProcessor/DataSpecification/Utils.php

Civi/DataProcessor/Factory.php

...taProcessor/FieldOutputHandler/FileFieldOutputHandler.php

Civi/DataProcessor/FilterHandler/SimpleSqlFilter.php

Civi/DataProcessor/Output/Api.php

Civi/DataProcessor/Source/AbstractCivicrmEntitySource.php

Civi/DataProcessor/Source/Campaign/CampaignSource.php

.../CRM/DataprocessorOutputExport/Form/Configuration/CSV.tpl

...ssorSearch/Form/OutputConfiguration/ParticipantSearch.tpl

templates/CRM/DataprocessorSearch/Form/ParticipantSearch.tpl