diff --git a/group04/1906242834/src/com/coderising/litestruts/Struts.java b/group04/1906242834/src/com/coderising/litestruts/Struts.java
index a223535fe0..99fec0d190 100644
--- a/group04/1906242834/src/com/coderising/litestruts/Struts.java
+++ b/group04/1906242834/src/com/coderising/litestruts/Struts.java
@@ -31,8 +31,6 @@ public static View runAction(String actionName, Map<String,String> parameters) {
     	return null;
     }    
 
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/Struts.java
 
-=======
 }
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/Struts.java
+
diff --git a/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java b/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
index 6fca790fe6..73a0d3d639 100644
--- a/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
+++ b/group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
@@ -40,8 +40,8 @@ public void testLoginActionFailed() {
         Assert.assertEquals("/jsp/showLogin.jsp", view.getJsp());
         Assert.assertEquals("login failed,please check your user/pwd", view.getParameters().get("message"));
 	}
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/StrutsTest.java
+
 }
-=======
 
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/StrutsTest.java
+
+
diff --git a/group04/1906242834/src/com/coderising/litestruts/struts.xml b/group04/1906242834/src/com/coderising/litestruts/struts.xml
index 4e12e08fac..ffc6373269 100644
--- a/group04/1906242834/src/com/coderising/litestruts/struts.xml
+++ b/group04/1906242834/src/com/coderising/litestruts/struts.xml
@@ -1,6 +1,6 @@
-<<<<<<< HEAD:group04/1906242834/src/com/coderising/litestruts/struts.xml
-<?xml version="1.0" encoding="UTF-8"?>
-=======
+
+
+
 <?xml version="1.0" encoding="UTF-8"?>
 <struts>
     <action name="login" class="com.coderising.litestruts.LoginAction">
@@ -11,5 +11,4 @@
     	<result name="success">/jsp/welcome.jsp</result>
     	<result name="error">/jsp/error.jsp</result>
     </action>
->>>>>>> upstream/master:liuxin/src/com/coderising/litestruts/struts.xml
 </struts>
\ No newline at end of file
diff --git a/group04/564451732/hw2/.classpath b/group04/564451732/hw2/.classpath
index db1218247e..373dce4005 100644
--- a/group04/564451732/hw2/.classpath
+++ b/group04/564451732/hw2/.classpath
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:group04/564451732/hw2/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
@@ -6,5 +5,3 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
-=======
->>>>>>> upstream/master:liuxin/.classpath