Basic game logic
Fixed merge conflict