merging problem, missing files?