diff --git a/README.en.md b/README.en.md
index 6e12edd..cb0f8aa 100644
--- a/README.en.md
+++ b/README.en.md
@@ -179,6 +179,7 @@ Example of a Response Hook function:
 
 For more custom interface examples, refer to: [custom-api.md](https://github.com/fishjar/kiss-translator/blob/master/custom-api.md)
 
+<<<<<<< HEAD
 ## Future Plans 
 
  This is a side project with no strict timeline. Community contributions are welcome. The following are preliminary feature directions:
@@ -192,6 +193,8 @@ For more custom interface examples, refer to: [custom-api.md](https://github.com
 
  If you're interested in any of these directions, feel free to discuss in [Issues](https://github.com/fishjar/kiss-translator/issues) or submit a PR!
 
+=======
+>>>>>>> 39b3b00117ee4f9a43c9489638bf7438db5c2101
 ## Development Guidelines
 
 ```sh
diff --git a/README.md b/README.md
index 6a550d0..e9bebf3 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ Response Hook 函数示例如下：
 
 更多的自定义接口示例，请参考： [custom-api.md](https://github.com/fishjar/kiss-translator/blob/master/custom-api.md)
 
+<<<<<<< HEAD
 ## 未来规划 
 
  本项目为业余开发，无严格时间表，欢迎社区共建。以下为初步设想的功能方向：
@@ -191,6 +192,8 @@ Response Hook 函数示例如下：
  
  如果你对某个方向感兴趣，欢迎在 [Issues](https://github.com/fishjar/kiss-translator/issues) 中讨论或提交 PR！
 
+=======
+>>>>>>> 39b3b00117ee4f9a43c9489638bf7438db5c2101
 ## 开发指引
 
 ```sh