Merge conflict resolution-3

Author: anavinahar

src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.dll-Help.xml

@@ -25648,13 +25648,7 @@ PublicIpAddress           : {
                             }
 InboundNatRules           : null
 LoadBalancingRules        : null
-<<<<<<< HEAD
-InboundNatPools           : null
-</maml:para>
-
-=======
 InboundNatPools           : null</maml:para>
->>>>>>> upstream/dev
 			</dev:remarks>
 			<command:commandLines>
 				<command:commandLine>