Refactoring of property name conflict resolution: fixes issues #193 and #327