merging new file stuff