diff --git a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
index 636777983aecee41ae624133cbd2ad9813482520..baab93660becf2f70bd62318954d9aef33eb257c 100644
--- a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
+++ b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
@@ -7,4 +7,7 @@ Bug Fixes
 
 * Fix Centreon Engine configuration form
 * Fix custom view sharing
+<<<<<<< HEAD
 * Fix Knowledge Base script compatibility with PHP < 5.4
+=======
+>>>>>>> a9015123a... Prepare 2.8.8 release.
diff --git a/doc/en/release_notes/centreon-2.8/index.rst b/doc/en/release_notes/centreon-2.8/index.rst
index 3c75036eda36806adcacf6f9dc6ed1ebf52364c4..48d154833589d9d91e0b8192494c00e0ad60ff1c 100644
--- a/doc/en/release_notes/centreon-2.8/index.rst
+++ b/doc/en/release_notes/centreon-2.8/index.rst
@@ -15,6 +15,7 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre
     centreon-2.8.6
     centreon-2.8.7
     centreon-2.8.8
+<<<<<<< HEAD
     centreon-2.8.9
     centreon-2.8.10
     centreon-2.8.11
@@ -26,3 +27,5 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre
     centreon-2.8.17
     centreon-2.8.18
     centreon-2.8.19
+=======
+>>>>>>> a9015123a... Prepare 2.8.8 release.