diff --git a/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java b/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java
index <HASH>..<HASH> 100644
--- a/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java
+++ b/ui/admin/src/main/java/org/openengsb/ui/admin/testClient/TestClient.java
@@ -74,11 +74,8 @@ import org.openengsb.ui.admin.model.Argument;
 import org.openengsb.ui.admin.model.MethodCall;
 import org.openengsb.ui.admin.model.MethodId;
 import org.openengsb.ui.admin.model.ServiceId;
-<<<<<<< HEAD
 import org.openengsb.ui.admin.organizeGlobalsPage.OrganizeGlobalsPage;
-=======
 import org.openengsb.ui.admin.organizeImportsPage.OrganizeImportsPage;
->>>>>>> 70181519016c268a4bbe96e831f5062120b3ff7e
 import org.openengsb.ui.common.model.LocalizableStringModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
[OPENENGSB-<I>] Corrected merge problem