Do logging only if Z_TOC_DEBUG environment variable is set.

Raise ConflictError from _p_resolveConflict instead of returning None if
conflict cannot be resolved.  I think someone changed the contract of
this method but the code hasn't caught up til now.