merged both files