diff --git a/docs/resources/aide_conf.md.erb b/docs/resources/aide_conf.md.erb
index 41864e0c0..1d2595ad2 100644
--- a/docs/resources/aide_conf.md.erb
+++ b/docs/resources/aide_conf.md.erb
@@ -73,10 +73,4 @@ The following examples show how to use this InSpec audit resource.
 
 ## Matchers
 
-<<<<<<< HEAD
-For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/). 
-=======
-For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
->>>>>>> Add one comma in all docs & deletes two repeated sentences.
-
-
+For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
\ No newline at end of file
diff --git a/docs/resources/azure_generic_resource.md.erb b/docs/resources/azure_generic_resource.md.erb
index 6892e69e4..1435c5694 100644
--- a/docs/resources/azure_generic_resource.md.erb
+++ b/docs/resources/azure_generic_resource.md.erb
@@ -232,10 +232,4 @@ Please see the integration tests for in depth examples of how this resource can
 
 ## Matchers
 
-<<<<<<< HEAD
-For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
-
-=======
-For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
- 
->>>>>>> Add one comma in all docs & deletes two repeated sentences.
+For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
\ No newline at end of file
diff --git a/docs/resources/inetd_conf.md.erb b/docs/resources/inetd_conf.md.erb
index 1db0a7bc0..ffaa6f2f5 100644
--- a/docs/resources/inetd_conf.md.erb
+++ b/docs/resources/inetd_conf.md.erb
@@ -90,11 +90,5 @@ then the same test will return `false` for `ftp` and the entire test will fail.
 
 ## Matchers
 
-<<<<<<< HEAD
-For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
-=======
-
-
 For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
->>>>>>> Add one comma in all docs & deletes two repeated sentences.