diff --git a/priv/static/js/app.js b/priv/static/js/app.js
index 5168888..2689559 100644
--- a/priv/static/js/app.js
+++ b/priv/static/js/app.js
@@ -125,7 +125,11 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _css
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+<<<<<<< HEAD
 eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var phoenix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! phoenix */ \"../deps/phoenix/priv/static/phoenix.js\");\n/* harmony import */ var phoenix__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(phoenix__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _users__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./users */ \"./js/users.js\");\n\n\nvar socket = new phoenix__WEBPACK_IMPORTED_MODULE_0__[\"Socket\"]('/socket', {\n  params: {\n    username: window.pointingParty.username\n  }\n});\nsocket.connect();\nvar driving = false; // connect to Presence here\n// set up your syncDiff function using updateUsers as a callback\n\nvar startButton = document.querySelector('.start-button');\nstartButton.addEventListener('click', function (event) {\n  driving = true; // send 'start_pointing' message to the channel here\n});\ndocument.querySelectorAll('.next-card').forEach(function (elem) {\n  elem.addEventListener('click', function (event) {// send 'finalized_points' message to the channel here\n  });\n});\ndocument.querySelector('.calculate-points').addEventListener('click', function (event) {\n  var storyPoints = document.querySelector('.story-points'); // send 'user_estimated' to the channel here\n}); // call the relevant function defined below when you receive the following events from the channel:\n// 'next_card'\n// 'winner'\n// 'tie'\n\nvar showCard = function showCard(state) {\n  document.querySelector('.start-button').style.display = \"none\";\n  document.querySelector('.winner').style.display = \"none\";\n  document.querySelector('.tie').style.display = \"none\";\n  document.querySelector('.calculate-points').style.display = \"inline-block\";\n  document.querySelector('.ticket').style.display = \"block\";\n  document.querySelector('.ticket-title').innerHTML = state.card.title;\n  document.querySelector('.ticket-description').innerHTML = state.card.description;\n};\n\nvar showWinner = function showWinner(state) {\n  document.querySelector('.winner').style.display = \"block\";\n  document.querySelector('.calculate-points').style.display = \"none\";\n  document.querySelector('.final-points').innerHTML = \"Winner: \" + state.points + \" Points\";\n  document.querySelector('.next-card').value = state.points;\n  document.querySelector('.next-card').disabled = !driving;\n};\n\nvar showTie = function showTie(state) {\n  document.querySelector('.tie').style.display = \"block\";\n  document.querySelector('.calculate-points').style.display = \"none\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].value = state.points[0];\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].innerHTML = state.points[0] + \" Points\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].disabled = !driving;\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].value = state.points[1];\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].innerHTML = state.points[1] + \" Points\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].disabled = !driving;\n};\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (socket);\n\n//# sourceURL=webpack:///./js/socket.js?");
+=======
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var phoenix__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! phoenix */ \"../deps/phoenix/priv/static/phoenix.js\");\n/* harmony import */ var phoenix__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(phoenix__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _users__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./users */ \"./js/users.js\");\n\n\nvar socket = new phoenix__WEBPACK_IMPORTED_MODULE_0__[\"Socket\"]('/socket', {\n  params: {\n    username: window.pointingParty.username\n  }\n});\nsocket.connect();\nvar channel = socket.channel('room:lobby', {});\nvar presence = new phoenix__WEBPACK_IMPORTED_MODULE_0__[\"Presence\"](channel);\npresence.onSync(function () {\n  return Object(_users__WEBPACK_IMPORTED_MODULE_1__[\"default\"])(presence);\n});\nvar driving = false;\n\nif (window.pointingParty.username) {\n  channel.join().receive('ok', function (resp) {\n    console.log('Joined successfully', resp);\n  }).receive('error', function (resp) {\n    console.log('Unable to join', resp);\n  });\n}\n\nvar startButton = document.querySelector('.start-button');\nstartButton.addEventListener('click', function (e) {\n  driving = true;\n  channel.push('start_pointing', {});\n});\nvar nextCardButtons = document.getElementsByClassName('next-card');\n\nfor (var i = 0; i < nextCardButtons.length; i++) {\n  nextCardButtons[i].addEventListener('click', function (e) {\n    channel.push('next_card', {\n      points: e.target.value\n    });\n  });\n}\n\ndocument.querySelector('.calculate-points').addEventListener('click', function (event) {\n  var storyPoints = document.querySelector('.story-points');\n  channel.push('user_estimated', {\n    points: storyPoints.value\n  });\n});\nchannel.on('new_card', function (state) {\n  document.querySelector('.start-button').style.display = \"none\";\n  document.querySelector('.winner').style.display = \"none\";\n  document.querySelector('.tie').style.display = \"none\";\n  document.querySelector('.calculate-points').style.display = \"inline-block\";\n  document.querySelector('.ticket').style.display = \"block\";\n  document.querySelector('.ticket-title').innerHTML = state.card.title;\n  document.querySelector('.ticket-description').innerHTML = state.card.description;\n});\n\nvar renderVotingResults = function renderVotingResults(template) {\n  var pointContainer = document.querySelector('.points-container');\n  renderTemplate(pointContainer, template);\n  document.querySelector('.next-card').addEventListener('click', function (e) {\n    channel.push('finalized_points', {\n      points: e.target.value\n    });\n  });\n};\n\nchannel.on('winner', function (state) {\n  document.querySelector('.winner').style.display = \"block\";\n  document.querySelector('.calculate-points').style.display = \"none\";\n  document.querySelector('.final-points').innerHTML = \"Winner: \" + state.points + \" Points\";\n  document.querySelector('.next-card').value = state.points;\n  document.querySelector('.next-card').disabled = !driving;\n});\nchannel.on('tie', function (state) {\n  document.querySelector('.tie').style.display = \"block\";\n  document.querySelector('.calculate-points').style.display = \"none\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].value = state.points[0];\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].innerHTML = state.points[0] + \" Points\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[0].disabled = !driving;\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].value = state.points[1];\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].innerHTML = state.points[1] + \" Points\";\n  document.querySelector('.tie').getElementsByClassName('next-card')[1].disabled = !driving;\n});\n/* harmony default export */ __webpack_exports__[\"default\"] = (socket);\n\n//# sourceURL=webpack:///./js/socket.js?");
+>>>>>>> a857c37... fix
 
 /***/ }),