diff --git a/README.md b/README.md
index bd59ef20..ebb5eff3 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,6 @@ This is the vim configurations based on [amix/vimrc](https://github.com/amix/vim
 
 * Add [easymotion](https://github.com/easymotion/vim-easymotion) for (IMHO) better development experience.
 
-<<<<<<< HEAD
 * Change [lightline](https://github.com/itchyny/lightline.vim) to [vim-airline](https://github.com/vim-airline/vim-airline).
 
-Detail changes can be found in [./my_config.vim](./my_config.vim) and [./my_plugins](./my_plugins).
-=======
 Detail changes can be found in [./my_configs.vim](./my_configs.vim) and [./my_plugins](./my_plugins).
->>>>>>> 0143ba686b069e6884e88663ee27c5783af356b0