Merge Conflict Part 4

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

@@ -136,7 +136,7 @@
     <Compile Include="ScenarioTests\IaasVm\PolicyTests.cs" />
     <Compile Include="ScenarioTests\IaasVm\ContainerTests.cs" />
     <Compile Include="ScenarioTests\Mab\ContainerTests.cs" />
-    <Compile Include="ScenarioTests\Dpm\ContainerTests.cs" />
+    <Compile Include="ScenarioTests\Dpm\ContainerTests.cs"/>
     <Compile Include="ScenarioTests\TestsBase.cs" />
     <None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.ContainerTests\TestGetContainerScenario.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>