Fix mishandled conflicts

Gateway/Request/RecurringDataBuilder.php

@@ -63,7 +63,7 @@ class RecurringDataBuilder implements BuilderInterface
         $payment = $paymentDataObject->getPayment();
         $storeId = $payment->getOrder()->getStoreId();
         $areaCode = $this->appState->getAreaCode();
-        $request['body'] =  $this->adyenRequestsHelper->buildRecurringData([], $areaCode, $storeId);
+        $request['body'] =  $this->adyenRequestsHelper->buildRecurringData($areaCode, $storeId, []);
         return $request;
     }
 }

Observer/AdyenCcDataAssignObserver.php

@@ -26,7 +26,7 @@ namespace Adyen\Payment\Observer;
 use Magento\Framework\Event\Observer;
 use Magento\Quote\Api\Data\PaymentInterface;
 
-class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
+class AdyenCcDataAssignObserver extends AdyenAbstractDataAssignObserver
 {
     /**
      * Approved root level keys from additional data array

Observer/AdyenHppDataAssignObserver.php

@@ -26,7 +26,7 @@ namespace Adyen\Payment\Observer;
 use Magento\Framework\Event\Observer;
 use Magento\Quote\Api\Data\PaymentInterface;
 
-class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
+class AdyenHppDataAssignObserver extends AdyenAbstractDataAssignObserver
 {
     /**
      * Approved root level keys from additional data array