diff --git a/readme.md b/readme.md
index 1b621cf..0920744 100644
--- a/readme.md
+++ b/readme.md
@@ -7,10 +7,13 @@
+<<<<<<< HEAD
###部落格
https://file-eastdawnjp.cdn.hinet.net/blog/
+=======
+>>>>>>> 6641f9a5617eb6bc1b556141295c611c26970a08
### line 客服