"conflict resolved in the message properties"
Merge pull request #222 from suryanarayanakb/dev-branch

message properties changed