DE487 - Duplicate message name
Merge conflicts