Fix Merge Conflicts (#1686)

* Forgot VS Code doesn't have auto save and fixed merge conflict locally but never actually commited them

* Fix broken link

releases/2020-07/java.md

@@ -419,7 +419,7 @@ Detailed changelogs are linked from the [Quick Links](#quick-links) below. Here
 
 ### New Management Libraries
 
-A new set of management libraries that follow the [Azure SDK Design Guidelines for Java](https://azure.github.io/azure-sdk/java/guidelines/) are now in Public Preview. These new libraries provide a higher-level, object-oriented API for managing Azure resources, that is optimized for ease of use, succinctness and consistency. You can find the list of new packages [on this page](https://azure.github.io/azure-sdk/releases/latest/java.html). Detailed documentation and code samples for these new libraries can be [found here](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/management)
+A new set of management libraries that follow the [Azure SDK Design Guidelines for Java](https://azure.github.io/azure-sdk/java/guidelines/) are now in Public Preview. These new libraries provide a higher-level, object-oriented API for managing Azure resources, that is optimized for ease of use, succinctness and consistency. You can find the list of new packages [on this page](https://azure.github.io/azure-sdk/releases/latest/java.html). Detailed documentation and code samples for these new libraries can be [found here](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/resourcemanager)
 
 These new packages share the same groupId ``com.azures.resourcemanager`` and artifactId share the same prefix of ``azure-resourcemanager``
 

releases/2020-08/java.md

@@ -28,11 +28,8 @@ The Azure SDK team is pleased to announce our August 2020 client library release
 - Azure Core Serializer Json Jackson
 - Azure Core Tracing OpenTelemetry
 - Form Recognizer
-<<<<<<< HEAD
 - Azure Search Documents
-=======
 - Azure Service Bus
->>>>>>> 909ac89a4a5bac3741c7f777d8dc3a6370fa1343
 
 ## Installation Instructions
 
@@ -100,13 +97,14 @@ To use the GA and beta libraries, refer to the Maven dependency information belo
 
 <dependency>
   <groupId>com.azure</groupId>
-<<<<<<< HEAD
   <artifactId>azure-search-documents</artifactId>
   <version>11.1.0-beta.1</version>
-=======
+</dependency>
+
+<dependency>
+  <groupId>com.azure</groupId>
   <artifactId>azure-messaging-servicebus</artifactId>
   <version>7.0.0-beta.5</version>
->>>>>>> 909ac89a4a5bac3741c7f777d8dc3a6370fa1343
 </dependency>
 ```
 
@@ -241,7 +239,6 @@ Detailed changelogs are linked from the [Quick Links](#quick-links) below. Here
 #### Key Bug Fixes
 - Fixed `getFields()` on `RecognizedForm` to preserve service side ordering of fields.
 
-<<<<<<< HEAD
 ### Azure Search Documents ([Changelog](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/search/azure-search-documents/CHANGELOG.md#1110-beta1-2020-08-12))
 
 #### New Features 
@@ -250,7 +247,7 @@ Detailed changelogs are linked from the [Quick Links](#quick-links) below. Here
 - Added `SearchableFieldProperty`, `SimpleFieldProperty`, and `FieldBuilderIgnore` to annotate `Class`es passed into `buildSearchFields`.
 - Added `getDefaultLogOptions` to `SearchClientBuilder`, `SearchIndexCleintBuilder`, and `SearchIndexerClientBuilder`. Updated client construction to use default log options by default.
 - Added the ability for clients to accept a `JsonSerializer` to specify a custom JSON serialization layer when dealing with Search documents.
-=======
+
 ### Azure Service Bus ([Changelog](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md#700-beta5-2020-08-11))
 
 #### New features
@@ -262,7 +259,6 @@ Detailed changelogs are linked from the [Quick Links](#quick-links) below. Here
   CreateTopicOptions, and CreateSubscriptionOptions.
 - Only updateable properties on QueueProperties, TopicProperties, and SubscriptionProperties are exposed
 - MessageDetailCount is flattened and removed in QueueRuntimeInfo, TopicRuntimeInfo, and SubscriptionRuntimeInfo.
->>>>>>> 909ac89a4a5bac3741c7f777d8dc3a6370fa1343
 
 ## Need help