diff --git a/sites/all/modules/sf_import/sf_import.module b/sites/all/modules/sf_import/sf_import.module
index e4a9ae9..4f1fb40 100644
--- a/sites/all/modules/sf_import/sf_import.module
+++ b/sites/all/modules/sf_import/sf_import.module
@@ -21,9 +21,17 @@ function sf_import_create(&$form_state, $ongoing = 0) {
   while( $row = db_fetch_array( $results ) ) {
     $fieldmap_id = $row['fieldmap'];
     if ($map = module_invoke( 'salesforce_api', 'fieldmap_load', $fieldmap_id ) ) {
+<<<<<<< HEAD
+      if ($map['drupal'] != 'user') {
+        $options[$fieldmap_id] = 
+          salesforce_api_fieldmap_object_label('salesforce', $map['salesforce']) . ' => ' .
+          salesforce_api_fieldmap_object_label('drupal', $map['drupal']);
+      }
+=======
       $options[$fieldmap_id] = 
         salesforce_api_fieldmap_object_label('salesforce', $map['salesforce']) . ' => ' .
         salesforce_api_fieldmap_object_label('drupal', $map['drupal']);
+>>>>>>> df561d863a79a3e55825d478576736d4a2add244
     }
   }