diff --git a/configuration_examples/docker-compose/production.yml b/configuration_examples/docker-compose/production.yml
index 6128b060..2b7e3eef 100644
--- a/configuration_examples/docker-compose/production.yml
+++ b/configuration_examples/docker-compose/production.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 version: '2'
 services:
   thumbor: