diff --git a/README.md b/README.md
index 21b018c6a4..83459b0629 100644
--- a/README.md
+++ b/README.md
@@ -197,8 +197,13 @@ export PHRASEANET_APP_PORT=8082
 ```
 
 If you want persit this change you can also save your change in a files named `env.local` or `.env.local`
+<<<<<<< HEAD
 
 These files are git ignored and permit stack customization without git conflict generation.
+=======
+These files are git ignored and permit stack customization without git conflict generation.
+
+>>>>>>> update readme
 
 If you are not interested in the development of Phraseanet, you can ignore everything in `.env` after the `DEV Purpose` part.
 
@@ -219,7 +224,6 @@ This script is useful if you are using the database container within the stack.
 
 see more here ![stack](doc/infra/compose/stack.md)
 
-
 ### Using a env.local method for custom .env values
 
 It may be easier to deal with a local file to manage our env variables.