resolve merge conflict

Author: SteveSaunders1952

articles/spring-apps/toc.yml

@@ -266,9 +266,9 @@ items:
       href: how-to-self-diagnose-solve.md
     - name: Self diagnose running in VNET
       href: how-to-self-diagnose-running-in-vnet.md
-    - name: Troubleshoot common Azure Spring Apps issues
+    - name: Troubleshoot common issues
       href: troubleshoot.md
-    - name: Troubleshoot common exit code issues in Azure Spring Apps
+    - name: Troubleshoot common exit code issues
       href: troubleshoot-exit-code.md
     - name: Capture heap/thread dump and use JFR
       href: how-to-capture-dumps.md

articles/spring-apps/troubleshoot-exit-code.md

@@ -15,8 +15,7 @@ ms.author: kunsun
 
 **This article applies to:** ✔️ Basic/Standard tier ✔️ Enterprise tier
 
-This article describes troubleshooting actions you can take when your application in Azure Spring Apps exits with an error code.
-You may generate an error code if your application deployment is unsuccessful, or if the application exits when it's running.
+This article describes troubleshooting actions you can take when your application in Azure Spring Apps exits with an error code. You may receive an error code if your application deployment is unsuccessful, or if the application exits when it's running.
 
 The exit code indicates the reason the application terminated. The following list describes some common exit codes:
 
@@ -40,17 +39,17 @@ The exit code indicates the reason the application terminated. The following lis
 
     For example, you need to connect to Azure Key Vault to import certificates in your application, but your application doesn't have the necessary permissions to access it.
 
-- **137** - The application exited because of an out of memory error. The application requested resources that the hosting platform failed to provide. Update your application's Java Virtual Machine (JVM) parameters to restrict resource usage, or scale up application resources.
+- **137** - The application exited because of an out-of-memory error. The application requested resources that the hosting platform failed to provide. Update your application's Java Virtual Machine (JVM) parameters to restrict resource usage or scale up application resources.
 
-  If the application is a Java application, check the JVM parameters. They may exceed the memory limit of your application.
+  If the application is a Java application, check the JVM parameter values. They may exceed the memory limit of your application.
 
-  For example, you configured 10 GB for the *Xmx* JVM parameter, but the application is using up to 5 GB of memory. Decrease the *Xmx* value or increase the application memory to make sure that the value of the *Xmx* parameter is lower or equal to the memory limit of the application.
+  For example, suppose you set the *Xmx* JVM parameter to 10 GB, but the application is using up to 5 GB of memory. Decrease the *Xmx* value or increase the application memory to make sure that the value of the *Xmx* parameter is lower or equal to the memory limit of the application.
 
-- **143** - The application exited because it failed to respond to a health check due to an out of memory error or some other error.
+- **143** - The application exited because it failed to respond to a health check due to an out-of-memory error or some other error.
 
-  This error code is most often generated by an out of memory error. For more information, see [How to fix app restart issues caused by out of memory](./how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
+  This error code is most often generated by an out-of-memory error. For more information, see [App restart issues caused by out-of-memory issues](./how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
 
-  For more information, see the [application log](https://aka.ms/azure-spring-cloud-doc-log).
+  You can also find more information from the application log by using the Azure CLI [az spring app logs](/cli/azure/spring/app#az-spring-app-logs) command.
 
 ## Next steps