I faced this problem before and to resolve it, I deleted from the project. Created in the as built and then claimed to both projects. That solved the problem and took less time than digging to find why the merge didn't work properly.

I believe the problem is because the claiming/unclaiming in version 6 does not always remove the entities from every table in the project when merging to the as built. Then when you claim to the second project and back to the original it gets confused....

How to prevent this? Run maintenance regularly on the database to ensure that orphan entities and records are removed.

Drew

llan, any remedial steps to overcome this nuisance?