diff --git a/src/systems/userinput/devices/mouse.js b/src/systems/userinput/devices/mouse.js
index eb5cef630f310c491c3a8dc3a4b2019259703b46..3252fb7372a53406da0992b8b3445a9f854dd065 100644
--- a/src/systems/userinput/devices/mouse.js
+++ b/src/systems/userinput/devices/mouse.js
@@ -70,4 +70,3 @@ export class MouseDevice {
 window.oncontextmenu = e => {
   e.preventDefault();
 };
->>>>>>> 81d272a82c36362425464a2dd8f222a60bdad7f6