fixed the merge files