fix missing merge