add test with new file
merge files