bugfix merge chatMessage