progress on stop merge