all files added
merge