Diff-3 (conflict)

???