fix

Author: YinglueZhang-MS

articles/spring-apps/how-to-create-user-defined-route-instance.md

@@ -33,15 +33,11 @@ The following illustration shows an example of an Azure Spring Apps virtual netw
 
 :::image type="content" source="media/how-to-create-user-defined-route-instance/user-defined-route-example-architecture.png" lightbox="media/how-to-create-user-defined-route-instance/user-defined-route-example-architecture.png" alt-text="Architecture diagram that shows user-defined routing.":::
 
-<<<<<<< HEAD
 * Public Ingress is forced to flow through firewall filters
   * ASA instance is isolated dedicated subnets.
   * The firewall is owned and managed by customers. Please ensure it builds a healthy envrioment for all functions you need.
 
-### Set configuration using environment variables
-=======
 ### Define environment variables
->>>>>>> 829bf83323859c6fcd404e991adaade3c408b07f
 
 The following example shows how to define a set of environment variables to be used in resource creation: