Fixing merge conflicts

Author: eshaparmar

src/Common/Commands.Common/Properties/Resources.resx

@@ -1363,8 +1363,7 @@ use and privacy statement at <url> and (c) agree to sharing my contact inf
   </data>
   <data name="ComputeCloudExceptionOperationIdMessage" xml:space="preserve"> 
     <value>OperationID : '{0}'</value> 
-    </data> 
-  </data>
+  </data> 
   <!-- DSC -->
   <data name="PublishVMDscExtensionGetDscResourceFailed" xml:space="preserve">
     <value>Cannot get module for DscResource '{0}'. Possible solutions: