Changed how message sending works
Fixed merge conflict