Minor updates with the message
Minor update to Messaging
Resolved Conflict