Add missing merge code