conflict resolved

Author: engcom-Echo

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php

@@ -10,20 +10,16 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
-use Magento\Framework\AuthorizationInterface;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Authorization\Model\Role;
 use Magento\User\Model\User;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class CategoriesTest
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoriesTest extends AbstractModifierTest
@@ -59,7 +55,7 @@ class CategoriesTest extends AbstractModifierTest
     private $authorizationMock;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session|\PHPUnit\Framework\MockObject\MockObject
+     * @var Session|MockObject
      */
     private $sessionMock;
 
@@ -88,7 +84,6 @@ protected function setUp(): void
             ->setMethods(['getUser'])
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->categoryCollectionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->categoryCollectionMock);