more gameplay
 manual merge
merging