keep junk files out of the source tree
merge