Fix merge errors

tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php

@@ -543,45 +543,7 @@ class CsrfProtectionMiddlewareTest extends TestCase
         $this->assertInstanceOf(Response::class, $response);
     }
 
-<<<<<<< HEAD
-    /**
-     * @return void
-     */
-    public function testSkippingTokenCheckUsingSkipCheckCallback()
-=======
-    public function testSkippingTokenCheckUsingWhitelistCallback(): void
-    {
-        $this->deprecated(function (): void {
-            $request = new ServerRequest([
-                'post' => [
-                    '_csrfToken' => 'foo',
-                ],
-                'environment' => [
-                    'REQUEST_METHOD' => 'POST',
-                ],
-            ]);
-            $response = new Response();
-
-            $middleware = new CsrfProtectionMiddleware();
-            $middleware->whitelistCallback(function (ServerRequestInterface $request) {
-                $this->assertSame('POST', $request->getServerParams()['REQUEST_METHOD']);
-
-                return true;
-            });
-
-            $handler = new TestRequestHandler(function ($request) {
-                $this->assertEmpty($request->getParsedBody());
-
-                return new Response();
-            });
-
-            $response = $middleware->process($request, $handler);
-            $this->assertInstanceOf(Response::class, $response);
-        });
-    }
-
     public function testSkippingTokenCheckUsingSkipCheckCallback(): void
->>>>>>> 4.next
     {
         $request = new ServerRequest([
             'post' => [

tests/test_app/Plugin/TestPlugin/src/Command/SampleSubCommand.php

@@ -23,7 +23,6 @@ use Cake\Console\ConsoleIo;
 class SampleSubCommand extends Command
 {
     /**
-<<<<<<< HEAD:tests/test_app/Plugin/TestPlugin/src/Command/SampleSubCommand.php
      * Get the command name.
      *
      * @return string
@@ -34,11 +33,6 @@ class SampleSubCommand extends Command
     }
 
     public function execute(Arguments $args, ConsoleIo $io)
-=======
-     * say_hello method
-     */
-    public function say_hello(): void
->>>>>>> 4.next:tests/test_app/Plugin/TestPluginTwo/src/Shell/WelcomeShell.php
     {
     }
 }