fix merge conflict

Author: oeggert

sidebars.yaml

@@ -211,10 +211,13 @@
                 - page: docs/tutorials/javascript/build-apps/get-started.md
                 - page: docs/tutorials/javascript/build-apps/build-a-browser-wallet-in-javascript.md
                 - page: docs/tutorials/javascript/build-apps/build-a-desktop-wallet-in-javascript.md
+<<<<<<< HEAD
                 - page: docs/tutorials/javascript/build-apps/credential-issuing-service.md
             - page: docs/tutorials/javascript/compliance/index.md
               items:
                 - page: docs/tutorials/javascript/compliance/verify-credential.md                
+=======
+>>>>>>> d965bffcbe9b7a74498a9c7d398e75518645fa55
             - page: docs/tutorials/javascript/decentralized-finance/index.md
               expanded: false
               items: