Conflict Resolver RPC design
~Conversation:
#551 (closed)