missing files after merge