add message functionality.
resolves merge conflict