fix add files
merge