Merge: Correct detection of property name conflicts