Hello, It's not obvious from looking at the code: if a _p_resolveConflict function decides that it can't resolve the conflict, must it raise a ConflictError or is it sufficient to return None? -- http:// if le.o /