got basics of game working
fixed merge conflict