messaging tool full implementation
merge conflicts