Merge proposals

fldiff in Ubuntu has no merge proposals.