add client-conflict-resolution to doc

And move this file to the top of the project, as there was a similar
version ther.