resolving conflicts with ChatClient.js (again)