Update Directory.Packages.props

Author: SimonCropp

src/Directory.Packages.props

@@ -13,13 +13,8 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
-<<<<<<< HEAD
-    <PackageVersion Include="Polyfill" Version="9.0.3" />
-    <PackageVersion Include="ProjectDefaults" Version="1.0.162" />
-=======
     <PackageVersion Include="Polyfill" Version="9.3.1" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.163" />
->>>>>>> c6d4b49f8bbe6fa8b238f875f31ae046a43d20f0
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageVersion Include="Verify.NUnit" Version="28.7.1" />