Conflicts resolved in Chat client