fixing merge probs
fixing merge probs