btb finished
fixed merge probs