diff --git a/frontend/static/js/views/tournament/TournamentPageView.js b/frontend/static/js/views/tournament/TournamentPageView.js
index d5a73d9..6f50d46 100644
--- a/frontend/static/js/views/tournament/TournamentPageView.js
+++ b/frontend/static/js/views/tournament/TournamentPageView.js
@@ -163,15 +163,11 @@ export default class extends AbstractAuthenticatedView
 				</tbody>
 			</table>
 			<input type="button" id="button" value="Join tournament" disabled>
-<<<<<<< HEAD
+			<textarea id="chat" rows="4" cols="50" readonly>
+			</textarea>
 			<br>
 			<svg id="tree" height="3000" width="3000">
 			</svg>
-=======
-			<span id="display"></span>
-			<textarea id="chat" rows="4" cols="50" readonly>
-			</textarea>
->>>>>>> 55d29d5763f22f136d2b4bae6464463acb514a5c
 		`;
 	}
 }