check

check and merge the files