fixed my example game
fixed merge conflicts