Fix merge conflicts

Author: xavierdecoster

src/NuGetGallery/NuGetGallery.csproj

@@ -246,10 +246,6 @@
     <Compile Include="Migrations\201904252152567_DeletedByOptional.Designer.cs">
       <DependentUpon>201904252152567_DeletedByOptional.cs</DependentUpon>
     </Compile>
-    <Compile Include="Queries\AutocompleteCveIdQueryResults.cs" />
-    <Compile Include="Queries\AutocompleteCweIdQueryResults.cs" />
-    <Compile Include="Queries\AutocompleteCveIdQueryResult.cs" />
-    <Compile Include="Queries\AutocompleteCweIdQueryResult.cs" />
     <Compile Include="Services\IPackageDeprecationService.cs" />
     <Compile Include="Queries\AutocompleteDatabasePackageIdsQuery.cs" />
     <Compile Include="Queries\AutocompleteDatabasePackageVersionsQuery.cs" />
@@ -1723,6 +1719,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Migrations\201904251233185_RemoveVulnerabilityDataFromPackageDeprecationModel.resx">
       <DependentUpon>201904251233185_RemoveVulnerabilityDataFromPackageDeprecationModel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Migrations\201904252152567_DeletedByOptional.resx">
       <DependentUpon>201904252152567_DeletedByOptional.cs</DependentUpon>
     </EmbeddedResource>