Editing: diff3

BATAL