diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md
index 017694faf2..3cb604becf 100644
--- a/compose/compose-file/compose-versioning.md
+++ b/compose/compose-file/compose-versioning.md
@@ -429,16 +429,22 @@ the configuration that will be used to deploy by using the `--compatibility`
 flag with the `config` command.
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b3a1eb7... Use updated notes format
 > Do not use this in production!
 >
 > We recommend against using `--compatibility` mode in production. Because the
 > resulting configuration is only an approximate using non-Swarm mode
 > properties, it may produce unexpected results.
+<<<<<<< HEAD
 =======
 > **Note:** We recommend against using `--compatibility` mode in production.
 > Because the resulting configuration is only an approximate using non-Swarm
 > mode properties, it may produce unexpected results.
 >>>>>>> 93426bb... Document compatibility mode
+=======
+>>>>>>> b3a1eb7... Use updated notes format
 
 
 ## Compose file format references