diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 5d816c6..8d0e01f 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -282,12 +282,8 @@ export default class RoomClient
 
 	_startKeyListener()
 	{
-		// Add keypress event listener on document
-<<<<<<< HEAD
+		// Add keydown event listener on document
 		document.addEventListener('keydown', (event) =>
-=======
-		document.addEventListener('keypress', (event) =>
->>>>>>> 250679c... Fix typos
 		{
 			if (event.repeat) return;
 			const key = String.fromCharCode(event.which);