Merged 2 files