modify/delete conflict

Also written: modify/delete

A conflict where one side changed a file the other side deleted. You settle it with `git rm` to delete or `git add` to keep.