diff --cc core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
index 0b4c42a,bcfc8e1..0000000
--- a/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
+++ b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
@@@ -89,8 -89,8 +89,13 @@@ class CommonTestController 
     *   parameter.
     */
    public function destination() {
++<<<<<<< HEAD
 +    $destination = drupal_get_destination();
 +    $output = "The destination: " . SafeMarkup::checkPlain($destination['destination']);
++=======
+     $destination = \Drupal::destination()->getAsArray();
+     $output = "The destination: " . String::checkPlain($destination['destination']);
++>>>>>>> asdf
  
      return new Response($output);
    }