after merge with new file