diff --git a/engine.js b/engine.js
index b19d956..c704d72 100644
--- a/engine.js
+++ b/engine.js
@@ -6,7 +6,11 @@ let $playfield = document.querySelector(".playfield"),
   };
 
 let mobile = isMobile().any;
+<<<<<<< HEAD
 // main kbd = desktop keyboard | lista de posibilitati combinatii
+=======
+// main kbd = desktop keyboard lista de posibilitati combinatii
+>>>>>>> main
 let Password = {
   current: [],