diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index c9f8182..16a2b4e 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1738,8 +1738,7 @@ function install_import_translations(&$install_state) {
   if (count($languages) > 1 || !isset($languages['en'])) {
     $operations[] = array('_install_prepare_import', array(array_keys($languages), $install_state['server_pattern']));
 
-    // Set up a batch to import translations for drupal core. Translation import
-    // for contrib modules happens in install_finish_translations.
+    // Set up a batch to import translations for drupal core.
     foreach ($languages as $language) {
       if (locale_translation_use_remote_source()) {
         $operations[] = array('locale_translation_batch_fetch_download', array('drupal', $language->getId()));
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index e7f4ba8..b425f99 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -365,7 +365,6 @@ function locale_cron() {
 }
 
 /**
-<<<<<<< HEAD
  * Updates default configuration when new modules or themes are installed.
  */
 function locale_system_set_config_langcodes() {