combine new file and stub the rest