diff --git a/source/chapter2/25_Access_Control.md b/source/chapter2/25_Access_Control.md
index 5254094d..35e887b2 100644
--- a/source/chapter2/25_Access_Control.md
+++ b/source/chapter2/25_Access_Control.md
@@ -207,11 +207,7 @@ public enum CompassPoint {
 
 ```swift
 public class A {
-<<<<<<< HEAD
-    private func someMethod() {}
-=======
     fileprivate func someMethod() {}
->>>>>>> /25_Access_Control 修正标点使用，更新代码
 }
 
 internal class B: A {