Really fix overlapping in diff