Resolve missing merge conflicts