changed sending messages to sending all existing messages
fixed merge conflict
merge conflict
merge conflict