Merged a few files