fix missing merge error