fixed missing merge issue