Fix broken NuGet from merge conflict