Better client-side conflation This mostly ensures that the same code paths are used as for client-side conflation, as for server-side conflation. The client-side conflation adds the same keys that the server side conflation does, and then the conflation process continues on to the code that deals with server-side conflation information.