Fix conflict in doc/administration/auth/ldap.md

doc/administration/auth/ldap.md

@@ -253,7 +253,14 @@ group you can use the following syntax:
 (memberOf:1.2.840.113556.1.4.1941=CN=My Group,DC=Example,DC=com)
 ```
 
-<<<<<<< HEAD
+Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at 
+https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
+nested members in the user filter should not be confused with 
+[group sync nested groups support (EE only)](https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes).
+
+Please note that GitLab does not support the custom filter syntax used by
+omniauth-ldap.
+
 ### Escaping special characters
 
 If the `user_filter` DN contains a special characters. For example a comma
@@ -271,15 +278,6 @@ As an example the above DN would look like
 ```
 OU=GitLab\\5C\\2C Inc,DC=gitlab,DC=com
 ```
-=======
-Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at 
-https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
-nested members in the user filter should not be confused with 
-[group sync nested groups support (EE only)](https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes).
->>>>>>> ce-com/master
-
-Please note that GitLab does not support the custom filter syntax used by
-omniauth-ldap.
 
 ## Enabling LDAP sign-in for existing GitLab users