Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7 -r2460a1f5af08b0686a1c4e4cefa94781d7bbc9c8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 2460a1f5af08b0686a1c4e4cefa94781d7bbc9c8)
@@ -23,29 +23,6 @@
 
 package org.lamsfoundation.lams.tool.imageGallery.service;
 
-<<<<<<< HEAD
-=======
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeSet;
-
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-
->>>>>>> LDEV-5397
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
diff -u -r0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7 -r2460a1f5af08b0686a1c4e4cefa94781d7bbc9c8
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 2460a1f5af08b0686a1c4e4cefa94781d7bbc9c8)
@@ -23,23 +23,6 @@
 
 package org.lamsfoundation.lams.tool.commonCartridge.service;
 
-<<<<<<< HEAD
-=======
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-
->>>>>>> LDEV-5397
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;