Fixed broken conflict resolution
Andreas Jung authored
_p_resolveConflict could not handle tuples from getstate()
properly
58605592