changed game logic
merge conflicts