Update overview-manage-assets.md

Author: yujinkim-msft

articles/iot-operations/discover-manage-assets/overview-manage-assets.md

@@ -187,16 +187,8 @@ Spec:
 Events:                   <none>
 ```
 
-### Automatic asset discovery
+### Protocol connectivity and asset detection
 
-<<<<<<< Updated upstream
-Akri services let you deploy and configure connectivity protocols, such as OPC UA and ONVIF, at the edge. Akri services use the asset and device resources in Azure Device Registry to model the different device and protocol connections in your environment.
-
-Akri services simplify the process of creating assets by automatically onboarding assets with pre-configured datasets and device endpoints generated by the connectors to represent capabilities and devices on the network.
-
-To learn more, see [What is asset and device discovery (preview)?](overview-akri.md).
-=======
 Akri services let you deploy and configure connectivity protocols at the edge. Akri services use the asset and device resources in Azure Device Registry to model the different device and protocol connections in your environment. It enables you to easily onboard and provision assets with open standards. It provides an extensible framework for all device protocols and a single pane of glass view for all assets.
 
 Akri services simplify the process of creating assets by automatically onboarding assets with pre-configured datasets and endpoints generated by the connectors to represent capabilities and devices on the network.
->>>>>>> Stashed changes