Piet-Hein Peeters wrote: > Any other ideas why I get a merge conflict on the properties? Unfortunately not. Is this reproducible in a simpler test case or does it only occur in your production tree? Cheers, Raman Gupta