fixed missing merge