resolving conflicts with ChatClient.js