fix conflict

dspace-api/src/main/java/org/dspace/content/InProgressSubmission.java

@@ -7,10 +7,10 @@
  */
 package org.dspace.content;
 
-import java.sql.SQLException;
-
 import org.dspace.eperson.EPerson;
 
+import java.sql.SQLException;
+
 /**
  * Interface for manipulating in-progress submissions, without having to know at
  * which stage of submission they are (in workspace or workflow system)
@@ -25,7 +25,7 @@ public interface InProgressSubmission
      * 
      * @return the internal identifier
      */
-    int getID();
+    Integer getID();
 
     /**
      * Get the incomplete item object