ACQE-5169 : Resolved conflicts

Author: manjusha729

src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php

@@ -276,7 +276,7 @@ private function executeTestCommand(string $command, OutputInterface $output, $n
         $process->setTimeout(0);
 
         return $process->run(function ($type, $buffer) use ($output, $noAnsi) {
-            if ( $noAnsi != "") {
+            if ($noAnsi != "") {
                 $pattern = "/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]/";
                 // Use preg_replace to remove ANSI escape codes from the  string
                 $buffer = preg_replace($pattern, '', $buffer);