diff --git a/GE_Migrating_data/src/main/java/com/cqu/ge/ArchiveAPITest.java b/GE_Migrating_data/src/main/java/com/cqu/ge/ArchiveAPITest.java
index 1ffe701..8a7fe74 100644
--- a/GE_Migrating_data/src/main/java/com/cqu/ge/ArchiveAPITest.java
+++ b/GE_Migrating_data/src/main/java/com/cqu/ge/ArchiveAPITest.java
@@ -160,12 +160,9 @@ public class ArchiveAPITest {
 		
 		ArchiveServiceImpl instance = new ArchiveServiceImpl();
 		Archive result = instance.GetArchive(createdArchive.getName(), "User");
-		
-<<<<<<< HEAD
-//		assertEquals(createdArchive.getName(), result.getName());
-=======
+
 		assertEquals(createdArchive.getName(), result.getName());
->>>>>>> 74afd287d8c69e5aa5c2fc7ef4c6d7b90beb6455
+
 		
 		th.deleteArchive(createdArchive.getName());
 		
@@ -228,11 +225,9 @@ public class ArchiveAPITest {
 		ArchiveServiceImpl instance = new ArchiveServiceImpl();
 		Archive result = instance.AddArchive(archive);
 		
-<<<<<<< HEAD
-//		assertEquals(archive.getName(), result.getName());
-=======
+
 		assertEquals(archive.getName(), result.getName());
->>>>>>> 74afd287d8c69e5aa5c2fc7ef4c6d7b90beb6455
+
 		
 		TestHelper th = new TestHelper();
 		th.deleteArchive(archive.getName());