Add missing merge conflict file