diff --git a/README.md b/README.md
index 437de7ce..024b1f65 100644
--- a/README.md
+++ b/README.md
@@ -196,12 +196,7 @@ Set the following from the Advanced properties if necessary:
 
 ![connecttoinsights](https://github.com/KxSystems/kx-vscode/blob/main/img/insightsconnectionadvanced.png?raw=true)
 
-<<<<<<< 1.6DocUpdates
-!!!note "For kdb Insights Enterprise Free Trial instances"
-The realm is configured as `insights-{URL}` where {URL} is the 10 digit code in the trial URL. For example: if your trial url is https://fstc83yi5b.ft1.cld.kx.com/ the realm is `insights-fstc83yi5b`.
-=======
-  **Note** For kdb Insights Enterprise Free Trial instances the realm is configured as `insights-{URL}` where {URL} is the 10 digit code in the trial URL. For example: if your trial url is https://fstc83yi5b.ft1.cld.kx.com/ the realm should be `insights-fstc83yi5b`.
->>>>>>> dev
+**Note** For kdb Insights Enterprise Free Trial instances the realm is configured as `insights-{URL}` where {URL} is the 10 digit code in the trial URL. For example: if your trial url is https://fstc83yi5b.ft1.cld.kx.com/ the realm should be `insights-fstc83yi5b`.
 
 1. Click **Create Connection** and the **kdb Insights Enterprise** connection appears under **CONNECTIONS** in the primary sidebar.
 
@@ -217,7 +212,6 @@ If you close the extension, the connection also closes.
 
 [//]: # "In what context is the reserved alias name `insights` used? - BMA - the context is used on build the connection tree; different icon; different connection process. - DF - Is this connection process currently supported in kdb VS Code extension; if so, do we need to document it here?"
 
-
 #### Meta
 
 When connected **Insights** connections can be expanded to show the details returned by the [getMeta API](https://code.kx.com/draft/insights/api/database/query/get-meta.html) call, which provides information on the database schemas and all the analytics available.
@@ -232,7 +226,6 @@ The 'meta' node contains a child node for each of the child sections in the json
 
 You can refresh the meta data view at any time by choosing **Refresh meta data** from the right-click menu of an Insights connection.
 
-
 ## kdb language server
 
 A kdb language server is bundled with the kdb VS Code extension. It offers various common features to aid in the development of kdb code, including:
@@ -361,7 +354,6 @@ To do this:
 
 1. Use a [Workbook](#workbooks) to execute q or Python code against the data in your scratchpad using the variable you provided.
 
-
 ## Workbooks
 
 Workbooks provide a convenient way to prototype and execute q and python code against a q process and using the variables [populated into the scratchpad](#populate-scratchpad) of a **kdb Insights Enterprise** deployment by data sources.