diff --git a/docs/CM_Download.adoc b/docs/CM_Download.adoc
index b48589bbb..9da022f8e 100755
--- a/docs/CM_Download.adoc
+++ b/docs/CM_Download.adoc
@@ -8,15 +8,12 @@ Neil Clifford
 
 toc::[]
 
-<<<<<<< HEAD
-=======
 == Prerequisites
 
 To run Chronicle Map, please ensure you have first installed:
 
 * Java (1.8.0_91 or later)
 * Apache Maven (3.2.3 or later)
->>>>>>> origin/doco_refresh
 
 == License
 
diff --git a/docs/CM_Features.adoc b/docs/CM_Features.adoc
index eb03b1575..1fcfb168c 100755
--- a/docs/CM_Features.adoc
+++ b/docs/CM_Features.adoc
@@ -18,11 +18,8 @@ applications, such as trading and financial market applications.
  - **High concurrency**: Write queries scale well up to the number of hardware execution threads in
  the server. Read queries never block each other.
  - **Persistence to disk** - (Optional)
-<<<<<<< HEAD
  - **Multi-key queries** - (Optional, closed-source) - Eventually-consistent, fully-redundant, asynchronous replication across
-=======
  - **Multi-master replication** - (Optional, commercial functionality) - Eventually-consistent, fully-redundant, asynchronous replication across
->>>>>>> origin/doco_refresh
  servers, "last write wins" strategy by default, allows to implement custom https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type[state-based CRDT] strategy.
 
 == Unique features
diff --git a/docs/CM_Replication.adoc b/docs/CM_Replication.adoc
index ad3fbb18d..bf5444126 100755
--- a/docs/CM_Replication.adoc
+++ b/docs/CM_Replication.adoc
@@ -173,7 +173,6 @@ The following example uses a basic `yaml` configuration file to define defaults
 [source, yaml]
 ....
 !ReplicatedMapCfg {
-<<<<<<< HEAD
 
 hostId: 1, # host id must be unique within the cluster
 listenAddressHostPort: "localhost:9301", # address on which to listen for inbound replication requests
@@ -189,7 +188,6 @@ mapLogDirectory: target/mapReplicationLogs, # directory where replication events
 keysAreConstantSize: true, # determines how keys are serialised
 valuesAreConstantSize: true # determines how values are serialised
 
-=======
     hostId: 1, # host id must be unique within the cluster
     listenAddressHostPort: "localhost:9301", # address on which to listen for inbound replication requests
     entries: 10000, # entries hint suggesting the initial size of the map
@@ -203,7 +201,6 @@ valuesAreConstantSize: true # determines how values are serialised
     mapLogDirectory: target/mapReplicationLogs, # directory where replication events should be recorded
     keysAreConstantSize: true, # determines how keys are serialised
     valuesAreConstantSize: true # determines how values are serialised
->>>>>>> origin/doco_refresh
 }
 ....