Resolved a change from the merge conflict.
public sendmessage() should be a private method