diff --git a/dnsapi/README.md b/dnsapi/README.md
index edafa7c5..f1bf05e4 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -1056,6 +1056,7 @@ Now you can issue a certificate.
 acme.sh --issue --dns dns_namecheap -d example.com -d *.example.com
 ```
 
+<<<<<<< HEAD
 ## 54. Use MyDNS.JP API
 
 First, register to MyDNS.JP and get MasterID and Password.