try to fix merge probs