complete game workflow
merged conflicts