diff --git a/sco_version.py b/sco_version.py
index 16850850..9ad23532 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,11 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-<<<<<<< HEAD
 SCOVERSION = "9.6.0"
-=======
-SCOVERSION = "9.5.3"
->>>>>>> 2c93c35aa7972b502ddbda69b35cb40773317647
 
 SCONAME = "ScoDoc"