adding how to "merge" files from different collabrators.