Merged some files