Bug 20078: (follow-up) Prevent conflict from attribute duplication