Added missing merge