Fixed readme conflict

Author: konraddysput

README.md

@@ -129,20 +129,19 @@ The following is a reference guide to the Backtrace Client fields:
 - Retry interval: If the database is unable to send its record, this setting specifies how many seconds the library should wait between retries.
 - Maximum retries: If the database is unable to send its record, this setting specifies the maximum number of retries before the system gives up.
 - Retry order: This specifies in which order records are sent to the Backtrace server.
-
 # Android Specific information
 
 The backtrace-unity library includes support for capturing additional Android Native information, from underlying Android OS (Memory and process related), JNI, and NDK layers.
 
 ## Native process and memory related information
 
-system.memory usage related information including memfree, swapfree, and vmalloc.used is available. Additional VM details and voluntary / nonvountary ctxt switches are included.
+system.memory usage related information including memfree, swapfree, and vmalloc.used is now available. Additional VM details and voluntary / nonvountary ctxt switches are included.
 
 ## ANR
 
-When configuring the backtrace-unity client for an Android deployment in the Unity Editor, programmers will have a toggle to enable or disable `ANR reports`. This will use the default of 5 seconds.
+When configuring the backtrace-unity client for an Android deployment, programmers will have a toggle available in backtrace-unity GUI in the Unity Editor to enable or disable ANR reports. This will use the default of 5 seconds.
 
-## Debug Symbol upload
+## Symbols upload
 
 Unity allows developer to generate symbols archive called `symbols.zip` in the il2cpp build pipeline in the root directory of your game. In this archive you can find generated symbols for your game libraries. When your game crashes due to a native exception, your stack trace will contain only memory addresses instead of function name. Symbols from `symbols.zip` archive allows Backtrace to match function address to function name in your source code. 
 
@@ -361,34 +360,6 @@ Notes:
 - `BacktraceDatabase` `Count` method will return number of all records stored in database (included deduplicated records),
 - `BacktarceDatabase` `Delete` method will remove record (with multiple deduplicated records) at the same time.
 
-<<<<<<< HEAD
-=======
-# Android Specific information
-
-The backtrace-unity library includes support for capturing additional Android Native information, from underlying Android OS (Memory and process related), JNI, and NDK layers.
-
-## Native process and memory related information
-
-system.memory usage related information including memfree, swapfree, and vmalloc.used is now available. Additional VM details and voluntary / nonvountary ctxt switches are included.
-
-## ANR
-
-When configuring the backtrace-unity client for an Android deployment, programmers will have a toggle available in backtrace-unity GUI in the Unity Editor to enable or disable ANR reports. This will use the default of 5 seconds.
-
-## Symbols upload
-
-Unity allows developer to generate symbols archive called `symbols.zip` in the il2cpp build pipeline in the root directory of your game. In this archive you can find generated symbols for your game libraries. When your game crashes due to a native exception, your stack trace will contain only memory addresses instead of function name. Symbols from `symbols.zip` archive allows Backtrace to match function address to function name in your source code. 
-
-To generate `symbols.zip` archive make sure:
-* you selected il2cpp build,
-* you checked `Create symbols.zip` in the Build settings window
-![Create symbols.zip](./Documentation~/images/symbols.png)
-
-To upload symbols to Backtrace, you need to rename symbols generated by Unity end simply with a `.so` extension. By default, symbol files within the .zip will end with extension `.sym.so`. or `.dbg.so` Backtrace will only match symbols to files based on the ending with `.so` extension. Please ensure all files have a single `.so` extention before uploading the zip. To upload symbols please go to your project settings, to the `Upload an archive` tab under `Symbols` section. 
-
-Backtrace offers to upload symbols automatically from Unity Editor to your Backtrace instance. Backtrace symbols upload pipeline will be triggered after successfull build of il2cpp Android game and when Symbols upload token is available in Backtrace Client options. After successfull build, upload pipeline will confirm symbols upload.
-
->>>>>>> feature/uname-update
 # Architecture description
 
 ## BacktraceReport <a name="architecture-BacktraceReport"></a>