fixing merge probs