diff --git a/web/test/merge.java b/web/test/merge.java
index ebac8cc2bbb6fd23ed0aef16f8db1282d524843d..c446e80bb73dbe1dfb691973d0ccd9b0b3b282a6 100644
--- a/web/test/merge.java
+++ b/web/test/merge.java
@@ -5,10 +5,4 @@ class Person{
     int only_me = 1;
     int x = 11;
 }
-######edit second by fjl
-
-### 吴明东
-######edit third by fjl 
-// edit second by fjl
-
-// edit by wjy
+// clear
\ No newline at end of file