Fix missing merge conflict resolution.