fixed messaging
fixed merge conflict