Merge branch '5.x' into 5.next

composer.json

@@ -143,8 +143,7 @@
     },
     "support": {
         "issues": "https://github.com/cakephp/cakephp/issues",
-        "forum": "https://stackoverflow.com/tags/cakephp",
-        "irc": "irc://irc.freenode.org/cakephp",
+        "forum": "https://discourse.cakephp.org/",
         "source": "https://github.com/cakephp/cakephp"
     }
 }

tests/TestCase/Routing/RouterTest.php

@@ -3497,8 +3497,6 @@ class RouterTest extends TestCase
     }
 
     /**
-<<<<<<< HEAD
-=======
      * Test the url() function which wraps Router::url()
      *
      * @return void
@@ -3519,7 +3517,6 @@ class RouterTest extends TestCase
     }
 
     /**
->>>>>>> origin/4.next
      * Helper to create a request for a given URL and method.
      *
      * @param string $url The URL to create a request for