Fix missing merge