conflict
partial2