diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
index 5bbb93ad9b..e2a0b6b659 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
@@ -1930,7 +1930,6 @@ public class ItemImport
         boolean pathDeleted = path.delete();
         return (pathDeleted);
     }
-<<<<<<< HEAD
     
     /**
      * Generate a random filename based on current time
@@ -2120,6 +2119,3 @@ public class ItemImport
         }
     }
 }
-=======
-}
->>>>>>> DS-1686