---
Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
---
<<<<<<< HEAD
    $edit_path = $this->entity->getSystemPath('edit-form');
    $options = array('language' => $languages[$default_langcode]);
=======
    $uri = $this->entity->uri('edit-form');
    $edit_path = $uri['path'];
    $options = array(
      'language' => $languages[$default_langcode],
      'query' => array('content_translation_target' => $default_langcode),
    );
>>>>>>> 59 on 26th

patch was:

     $uri = $this->entity->uri('edit-form');
     $edit_path = $uri['path'];
-    $options = array('language' => $languages[$default_langcode]);
+    $options = array(
+      'language' => $languages[$default_langcode],
+      'query' => array('content_translation_target' => $default_langcode),
+    );

so just keeping the context lines from head.

---
core/modules/content_translation/content_translation.pages.inc
---
        // language we point the link to the translation form.
        if ($entity->access('update')) {
<<<<<<< HEAD
          $links['edit'] = isset($edit_links->links[$langcode]['href']) ? $edit_links->links[$langcode] : array('href' => $rel['edit-form'], 'language' => $language);
=======
          $links['edit'] = isset($edit_links->links[$langcode]['href']) ? $edit_links->links[$langcode] : array('href' => $rel['edit-form']['path'], 'language' => $language);
          $links['edit']['query']['content_translation_target'] = $langcode;
>>>>>>> 59 on 26th

patch was

         // language we point the link to the translation form.
         if ($entity->access('update')) {
           $links['edit'] = isset($edit_links->links[$langcode]['href']) ? $edit_links->links[$langcode] : array('href' => $rel['edit-form']['path'], 'language' => $language);
+          $links['edit']['query']['content_translation_target'] = $langcode;
         }

similar just keeping context lines from head.