diff --git a/spring/springmvc-base/README.md b/spring/springmvc-base/README.md
index 6378667..20e4dd5 100644
--- a/spring/springmvc-base/README.md
+++ b/spring/springmvc-base/README.md
@@ -940,5 +940,3 @@ public class RestfulController {
 }
 
 ```
-
->>>>>>> 719009b7e434876c2117d82a8a0cb31998acce33