merged some files