Expose ancestor path in Conflicts RPC
That will help to identify the type of conflict.
For example, when a conflict occurred because both sides added the same file, the ancestor of the conflict object will be missing. That'll help us to show the reason why a particular conflict occurred.