Resolved conflits in message properties.