Update game_doc.txt

diff --cc game_doc.txt
index 8d38e07d4dab4ad0465258e0f1fce0ecdcd90bbe,95224743ca9e14a588eb9470e84fa416f5a7a424..c30bf2e2ac1090cf77e75cf5f568eb629a328368
--- 1/game_doc.txt
--- 2/game_doc.txt
+++ b/game_doc.txt
@@@ -9,7 -9,7 +9,11 @@@ List of Dimensions
  
  Gameplay:
  - dialogue between npcs
++<<<<<<< HEAD
 +- combat, exploration
++=======
+ - combat, exploration with parkour or platforming
++>>>>>>> 37f90fc3e905b6de9f3dc742a368383efeffe158
  
  story
  - stars fall out of the sky and other people collected them including the player