diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php
index 932ad83b6..cc7808e43 100644
--- a/application/controllers/Adif.php
+++ b/application/controllers/Adif.php
@@ -240,7 +240,6 @@ class adif extends CI_Controller {
 						if ($contest != '') {
 							$record['contest_id'] = $contest;
 						}
-<<<<<<< HEAD
 
 						//check if contest_id exists in record and extract all found contest_ids
 						if(array_key_exists('contest_id', $record)){
@@ -254,11 +253,6 @@ class adif extends CI_Controller {
 							}
 						}
 
-=======
-						if ($club_operator != '') {
-							$record['operator']=strtoupper($club_operator);
-						}
->>>>>>> dev
 						if(count($record) == 0) {
 							break;
 						};
diff --git a/application/views/adif/import_success.php b/application/views/adif/import_success.php
index c2d36a281..6868cf2d0 100644
--- a/application/views/adif/import_success.php
+++ b/application/views/adif/import_success.php
@@ -20,6 +20,21 @@
              echo " ".__("Dupes were skipped.");
           } ?>
     </p>
+
+    <!-- Display imported information for contest data fixing if contest data was imported -->
+    <?php if(count($imported_contests) > 0)?>
+    <p style="color:red;"><?= __("You imported at least 1 QSO containing a contest ID.")?></p>
+    <p><?= __("Sometimes, depending on your contest logging software, your exchanges will not be imported properly from that softwares ADIF. If you like to correct that, switch to the CBR Import Tab of the ADIF Import page.")?></p>
+    <p><?= __("We found the following numbers of QSOs for the following contest IDs:")?></p>
+    
+    <!-- List imported contest data -->
+    <ul>
+    <?php foreach ($imported_contests as $contestid => $qsocount) { ?>
+      <li><?php echo $contestid . ' (' . $qsocount . ' '. ($qsocount == 1 ? 'QSO' : 'QSOs')  .')'; ?></li>
+    <?php } ?>
+    </ul>
+   
+    <!-- Display errors for ADIF import -->
     <?php if($adif_errors) { ?>
       <h3><?= __("Import details / possible problems")?></h3>
       <p><?= __("You might have ADIF errors, the QSOs have still been added. Please check the following information:")?></p>