CHANGE: separate diff and segmentation
FIX: did not segment if right side touched content