diff --git a/cms/models.py b/cms/models.py
index 37d036e..998225f 100644
--- a/cms/models.py
+++ b/cms/models.py
@@ -47,29 +47,9 @@ class Enseignant(models.Model):
         return '{0} {1}'.format(self.nom, self.prenom)
     
     def descr(self):
-<<<<<<< HEAD
-        return '{0} ({1})'.format(self.__str__(), self.email)     
-=======
-        return '{0} (<A HREF="{1}">{3}</A>)'.format(self.__str__(), self.email, self.email)
- 
-    
-class SVG_Domaine:
-    compteur = 0
-    x = 30
-    y = 10
-    width = 200
-    svg = '<rect x="20" y="{0}" rx="5" ry="5" width="60" height="{1}" fill="{3}" stroke="black" stroke-width="2" />'
-    txt = '<text x="25" y="{0}" style="stroke:#000000;font-size:12;">{1}</text>'
-    
-    def get_svg(self):
-        return '{0}{1}'.format(self.svg, self.txt)
-    
-    def __init__(self, domaine):
-        SVG_Domaine.compteur += 1
-        self.svg = self.svg.format(20, 100, settings.DOMAINE_COULEUR[domaine.code])
-        self.txt = self.txt.format(20, domaine.__str__())
-        
->>>>>>> 52cca0ce67c3fff10578bd13d8a9d4f1c0b77de5
+
+        return '{0} (<A HREF="{1}">{2}</A>)'.format(self.__str__(), self.email, self.email)
+
     
     
 class Domaine(models.Model):
diff --git a/common/settings.py b/common/settings.py
index e5c22c9..c2bd28d 100644
--- a/common/settings.py
+++ b/common/settings.py
@@ -109,7 +109,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 
-STATIC_URL = '/cms/static/'
+STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 MEDIA_URL = '/media/'
diff --git a/templates/cms/index.html b/templates/cms/index.html
index d4189b4..905d1d1 100644
--- a/templates/cms/index.html
+++ b/templates/cms/index.html
@@ -80,11 +80,7 @@
 	<td class="l6 p">{{P09.url|safe}}</td>
 	<td colspan="2" class="l6 m">{{M16_1a.url_code|safe}} / {{M16_1b.url_code|safe}} / {{M16_1c.url_code|safe}} / {{M16_1d.url_code|safe}} / {{M16_1e.url_code|safe}}</td>
 	<td colspan="2" class="l6 m">{{M16_2a.url_code|safe}}</td>
-<<<<<<< HEAD
 	<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}} / {{M16_3d.url_code|safe}} / {{M16_3e.url_code|safe}}</td>
-=======
-	<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}} / {{M16_3d.url_code|safe}}</td>
->>>>>>> 52cca0ce67c3fff10578bd13d8a9d4f1c0b77de5
 </tr>
 <!-- Ligne 7 -->
 <tr>
@@ -105,10 +101,6 @@
 <br/>
 <a href="{% url 'plan-pdf' %}">Imprimer en PDF</a>
 </div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 52cca0ce67c3fff10578bd13d8a9d4f1c0b77de5
 {% endblock %}