Working on game logic
Fix merge