AC-7014::Resolve conflicts

Author: glo82145

app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php

@@ -118,13 +118,9 @@ public function getRelations(array $products, int $linkType): array
         $collection = $link->getLinkCollection();
         $collection->addFieldToFilter('product_id', ['in' => array_keys($productsByActualIds)]);
         $collection->addLinkTypeIdFilter();
-<<<<<<< HEAD
         $collection->addProductIdFilter();
         $collection->joinAttributes();
         $collection->setOrder('position', 'ASC');
-=======
-
->>>>>>> parent of 775228092ef (BUG#AC-7014:elated, upsell and crosssell products query  position correctly saved in)
         //Prepare map
         $map = [];
         /** @var Link $item */