diff --git a/flask/testapp/static/javascript/beautyVote.js b/flask/testapp/static/javascript/beautyVote.js
index 2f1795b..e8d3a75 100644
--- a/flask/testapp/static/javascript/beautyVote.js
+++ b/flask/testapp/static/javascript/beautyVote.js
@@ -194,9 +194,6 @@
     var xhr = new XMLHttpRequest();
     xhr.open('POST', '/form');
     xhr.setRequestHeader('content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
-<<<<<<< HEAD
-    xhr.send(value);
-=======
     xhr.send('username=' + player.name + '&data=' + player.choice); //変更
     xhr.onreadystatechange = function() { //受信用
         if (xhr.readyState === 4 && xhr.status === 200) {
@@ -209,7 +206,6 @@
             }
         }
     }
->>>>>>> webserve
 }
 
 var round = 0;