Editing: vimdiff

BATAL