Fix the way merge points are computed.