update game checking logic
update merge conflicts