diff --git a/app/entreprises/forms.py b/app/entreprises/forms.py
index 74aa24ca64..1f76732dce 100644
--- a/app/entreprises/forms.py
+++ b/app/entreprises/forms.py
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
@@ -29,7 +27,6 @@
 import re
 import requests
 
->>>>>>> e0be0f8feef8cfb7f5da4fe516b33529ec1712c9
 from flask_wtf import FlaskForm
 from flask_wtf.file import FileField, FileAllowed, FileRequired
 from markupsafe import Markup