missing files in merge