diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8256536da..efba27f7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to
 * [activity] remove the "plus" button in activity list
 * [activity] check ACL on activity list in person context
 * [list for accompanying course in person] filter list using ACL
+* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
 
 ## Test releases
 
@@ -65,14 +66,6 @@ and this project adheres to
 * [person suggest] In widget "add person", improve the pertinence of persons when one of the names starts with the pattern;
 * [person] do not ask for center any more on person creation
 * [3party] do not ask for center any more on 3party creation
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
->>>>>>> 16b59681 (changelog updated)
-=======
-* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
->>>>>>> b8889ed58d3abb68d1c2859b31bf7428addda36e
 
 ## Test releases