Update Message.h

removed the conflict tag that git inserts into the file.