the merge didn't delete the src directory. This means I guess that these files won't have their history tracked in the versions in MSMBuilder/