fixed set game bug
merged conflict