start playing game working
merge conflict solved