diff --git a/app/templates/scolar/index.j2 b/app/templates/scolar/index.j2
index 01bc872f..0e151691 100644
--- a/app/templates/scolar/index.j2
+++ b/app/templates/scolar/index.j2
@@ -83,7 +83,6 @@ table.semlist tbody tr td.modalite {
   padding-right: 1em;
 }
 
-<<<<<<< HEAD
 div.modalite {
     font-size: 16px;
     font-weight: bold;
@@ -148,8 +147,6 @@ span.effectif {
 }
 
 
-=======
->>>>>>> b1055a4ebe841f17860d2556cc4b03aa12ec3ab1
 </style>
 
 {# News #}
diff --git a/sco_version.py b/sco_version.py
index 9e8a6b24..e0361b07 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,11 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-<<<<<<< HEAD
 SCOVERSION = "9.6.955"
-=======
-SCOVERSION = "9.6.954"
->>>>>>> b1055a4ebe841f17860d2556cc4b03aa12ec3ab1
 
 SCONAME = "ScoDoc"