Fix merge conflicts

Author: wtgodbe

NuGet.config

@@ -4,15 +4,17 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-206e310" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-206e3105/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-04a7251" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-04a72514/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-2595364" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-2595364d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-extensions-06a95a7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-06a95a71/nuget/v3/index.json" />
     <!--  Begin: Package sources from dotnet-razor-tooling -->
+    <add key="darc-int-dotnet-razor-tooling-256df67" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-256df67c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-razor-tooling -->
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-2d4bb96" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-2d4bb962/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  End: Package sources from dotnet-extensions -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -25,13 +27,15 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-core-setup -->
+    <add key="darc-int-dotnet-core-setup-2d4bb96" value="true" />
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-206e310" value="true" />
+    <add key="darc-int-dotnet-efcore-04a7251" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-2595364" value="true" />
+    <add key="darc-int-dotnet-extensions-06a95a7" value="true" />
     <!--  End: Package sources from dotnet-extensions -->
     <!--  Begin: Package sources from dotnet-razor-tooling -->
+    <add key="darc-int-dotnet-razor-tooling-256df67" value="true" />
     <!--  End: Package sources from dotnet-razor-tooling -->
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  Begin: Package sources from dotnet-corefx -->