add missing files
merge diff