move to github part 6: merge factory
move to github part 7