diff --git a/map/measure/measure-d.html b/map/measure/measure-d.html
index 25128c7..843a7bd 100644
--- a/map/measure/measure-d.html
+++ b/map/measure/measure-d.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="ja">
 <head>
@@ -21,6 +20,3 @@
 <script type="text/javascript" src="measure-d.js" charset="utf-8"></script>
 </body>
 </html>
-=======
-a
->>>>>>> refs/remotes/origin/master
