Conflict resolution
partial commit to debug conditional transformations