resolved missing merge