fix conflicts

Author: kmurphypolygon

mkdocs.yml

@@ -83,15 +83,10 @@ nav:
               - Start services: cdk/get-started/deploy-rollup/start-services.md
         - Connect to CDK testnet: cdk/get-started/connect-testnet.md
       - How to:
-<<<<<<< HEAD
-        - Quickly test a running stack: cdk/how-to/quick-test-stack.md
-        - Manage allowlists with policies: cdk/how-to/manage-policies.md
-=======
         - Use a native token: cdk/how-to/use-native-token.md
         - Integrate the AggLayer: cdk/how-to/integrate-agglayer.md
         - Manage allowlists with policies: cdk/how-to/manage-policies.md
         - Quickly test a running stack: cdk/how-to/quick-test-stack.md
->>>>>>> 4b8cb0fb97f6a2d3852bf7ebdaa96befec747f19
       - Architecture:
         - CDK rollup: cdk/architecture/cdk-zkevm.md
         - CDK validium: cdk/architecture/cdk-validium.md