merging files into master