created a messageWrapper
fixed merge conflict