resolved conflict in message properties