diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 9c05b62..3db9741 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -505,10 +505,8 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state
       return $this->buildForm($form, $form_state);
     }
 
-    $form['warning'] = [
-      '#type' => 'markup',
-      '#markup' => '<h3>' . $this->t('WARNING: Content may be overwritten') . '</h3>',
-    ];
+    drupal_set_message($this->t('WARNING: Content may be overwritten.'), 'warning');
+
     $form = parent::buildForm($form, $form_state);
     $form['actions']['submit']['#submit'] = ['::submitConfirmIdConflictForm'];
     $form['actions']['submit']['#value'] = $this->t('I acknowledge I may lose data, continue anyway.');
@@ -536,10 +534,10 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state
    *   The form structure.
    */
   protected function conflictsForm(array &$form, FormStateInterface $form_state, array $conflicts) {
-    $form['warning']['#markup'] .= '<p>' . $this->t('The upgrade should be performed on a clean Drupal 8 installation. It looks like you have content on your site which <strong>may be overwritten</strong> if you continue to run the upgrade. For more information, refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
+    $form['warning']['#markup'] .= '<p>' . $this->t('It looks like you have content on your site which <strong>may be overwritten</strong> if you continue to run the upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information, refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
 
     $form['conflicts'] = [
-      '#title' => $this->t('The conflicting content are of the following types:'),
+      '#title' => $this->t('There is conflicting content of these types:'),
       '#theme' => 'item_list',
       '#items' => $this->formatConflicts($conflicts),
     ];
@@ -587,10 +585,10 @@ protected function formatConflicts(array $conflicts) {
    *   The form structure.
    */
   protected function i18nWarningForm(array &$form, FormStateInterface $form_state, array $conflicts) {
-    $form['warning']['#markup'] .= '<p>' . $this->t('It looks like you are migrating translated content. The possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
+    $form['warning']['#markup'] .= '<p>' . $this->t('It looks like you are migrating translated content. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>';
 
     $form['i18n'] = [
-      '#title' => $this->t('The translated content are of the following types:'),
+      '#title' => $this->t('There is translated content of these types:'),
       '#theme' => 'item_list',
       '#items' => $this->formatConflicts($conflicts),
     ];