Bug fix in merge heuristic