fix build

Author: v-krishnag

articles/iot-central/core/howto-manage-devices-with-rest-api.md

@@ -724,8 +724,6 @@ Use the following command to generate a verification certificate from the verifi
   node create_test_cert.js verification --ca mytestrootcert_cert.pem --key mytestrootcert_key.pem --nonce  {verification-code}
   ```
 
-Now generate the base-64 encode version of the verification certificate by updating the location of the certificate in the javascript code above.
-
 Run the following command to generate a base-64 encoded version of the certificate:
 
 ```cmd/sh

articles/zone-pivot-groups.yml

@@ -255,7 +255,6 @@ groups:
     title: Python
   - id: programming-language-embedded-c
     title: Embedded C
-<<<<<<< HEAD
 - id: enrollment-groups
 # Owner: v-krishnag
   title: Enrollment groups
@@ -264,8 +263,7 @@ groups:
   - id: enrollment-group-x509
     title: X.509
   - id: enrollment-group-symmetrickey
-    title: Symmetric Key
-=======
+    title: Symmetric Key    
 - id: programming-languages-set-twenty-eight
 # Owner: aahi
   title: Programming languages
@@ -279,7 +277,6 @@ groups:
     title: JavaScript
   - id: programming-language-python
     title: Python
->>>>>>> 073acba84e51a8ee46c8b877786b6139a752eb76
 # Service-specific groups
 - id: cogsvcs-text-analytics-features
   title: Text Analytics features