diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index ac2e010996b323b7dfef1a5b9575caa888fa741e..725b080b6f095a129eb9508b7d16be5c3bdc3c7a 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
index ce1a44c46575a56c15135892bbe28423083e0ad4..3eb57b9dae97c00ae12d62f603722eb574551651 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/resources/Import.js
@@ -60,7 +60,7 @@ if (typeof (Vtiger_Import_Js) == 'undefined') {
 			return false;
         },
         uploadAndParse: function(auto_merge) {
-            if (Vtiger_Import_Js.validateFilePath() && Vtiger_Import_Js.validateMergeCriteria()) {
+            if (Vtiger_Import_Js.validateFilePath() && Vtiger_Import_Js.validateMergeCriteria(auto_merge)) {
                 jQuery("#auto_merge").val(auto_merge);
                 var form = jQuery("form[name='importBasic']");
                 var data = new FormData(form[0]);
@@ -245,18 +245,16 @@ if (typeof (Vtiger_Import_Js) == 'undefined') {
                         });
             }
         },
-        validateMergeCriteria: function() {
-            var selectedOptions = jQuery('#selected_merge_fields option');
-            if (selectedOptions.length == 0) {
-                var errorMessage = app.vtranslate('JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE');
-                var params = {
-                    text: errorMessage,
-                    'type': 'error'
-                };
-                Vtiger_Helper_Js.showMessage(params);
-                return false;
-            }
-            Vtiger_Import_Js.convertOptionsToJSONArray('#selected_merge_fields', '#merge_fields');
+        validateMergeCriteria: function(auto_merge) {
+			if (auto_merge == 1) {
+				var selectedOptions = jQuery('#selected_merge_fields option');
+				if (selectedOptions.length == 0) {
+					var errorMessage = app.vtranslate('JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE');
+					app.helper.showErrorNotification({message: errorMessage});
+					return false;
+				}
+				Vtiger_Import_Js.convertOptionsToJSONArray('#selected_merge_fields', '#merge_fields');
+			}
             return true;
         },
         //TODO move to a common file