diff --git a/README.md b/README.md
index 759c269..1253867 100644
--- a/README.md
+++ b/README.md
@@ -247,7 +247,6 @@ You can then run all the containers:
 docker-compose up -d
 ```
 
-<<<<<<< HEAD
 #### Use certificates to authenticate with CrowdSec
 
 You can follow the example in exemples/tls-auth to view how to authenticate with client certificates with the LAPI.