Update README.md

AoiKamishiro · AoiKamishiro · commit b81a3ca25b02 · 2020-08-25T22:00:43.000+09:00
diff --git a/README.md b/README.md
@@ -13,10 +13,4 @@
 <H3>連絡先</H3>
 <a>Twitter : @aoi3192</a>
 <br/>
-<<<<<<< HEAD
-<a>VRC : 神城 葵[Aoi_JPN]</a>
-=======
-<a>VRC : 神城 葵[Aoi_JPN]</a>
-
-
->>>>>>> 7f688bd82debc3eebd5c734f6563f057f23eb144
+<a>VRC : 神城 葵[Aoi_JPN]</a>
