fix merge conflicts

Author: kryalama

articles/azure-monitor/app/java-in-process-agent.md

@@ -44,7 +44,7 @@ Download the [applicationinsights-agent-3.2.4.jar](https://github.com/microsoft/
 >    For details, see the [3.1.0 release notes](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.1.0).
 >
 > If you're upgrading from 3.1.x:
->    - Starting from 3.2.0-BETA.3, InProc dependencies are not auto collected by default. For details on how to enable this, please see the [config options](./java-standalone-config.md#autocollect-inproc-dependencies-preview).
+>    -  Starting from 3.2.0, controller "InProc" dependencies are not captured by default. For details on how to enable this, please see the [config options](./java-standalone-config.md#autocollect-inproc-dependencies-preview).
 >    - Database dependency names are now more concise with the full (sanitized) query still present in the `data` field. HTTP dependency names are now more descriptive.
 >    This change can affect custom dashboards or alerts if they relied on the previous values.
 >    For details, see the [3.2.0 release notes](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.2.0).

articles/azure-monitor/app/java-standalone-config.md

@@ -230,7 +230,7 @@ Instrumentation key overrides allow you to override the [default instrumentation
 
 ## Autocollect InProc dependencies (preview)
 
-Starting from 3.2.0-BETA.3, if you want to automatically collect inproc dependencies, please use the following configuration:
+Starting from 3.2.0, if you want to capture controller "InProc" dependencies, please use the following configuration:
 
 ```json
 {