Update README.md

Author: Snailclimb

README.md

@@ -11,14 +11,10 @@
 -  ### Java多线程系列
    [多线程系列学习与面试](https://github.com/Snailclimb/Java_Guide/blob/master/Java/%E5%A4%9A%E7%BA%BF%E7%A8%8B%E7%B3%BB%E5%88%97.md)
 
-<<<<<<< HEAD
+
 - ### Java IO与NIO
   [Java IO与NIO学习与面试](https://github.com/Snailclimb/Java_Guide/blob/master/Java/Java%20IO%E4%B8%8ENIO.md)
-=======
-- ### Java NIO
-  [Java NIO系列学习与面试](https://github.com/Snailclimb/Java_Guide/blob/master/Java/Java%20IO%E4%B8%8ENIO.md)
->>>>>>> dd7361a05be2adae9681080398975190a4d86404
-   
+
 -  ### Java虚拟机（jvm）
    [Java虚拟机（jvm）知识学习与面试](https://github.com/Snailclimb/Java_Guide/blob/master/Java/Java%E8%99%9A%E6%8B%9F%E6%9C%BA%EF%BC%88jvm%EF%BC%89.md)