fixed game and merged by hand