Editing: diff3
ELF >