diff --git a/hash/vsmile_cd.xml b/hash/vsmile_cd.xml
index 4122579c9fe..735700a3519 100644
--- a/hash/vsmile_cd.xml
+++ b/hash/vsmile_cd.xml
@@ -54,11 +54,7 @@ Language:
 80-093140(US)   | Shrek The Third - The Search for Arthur
 80-093143(UK)   | Shrek The Third - The Search for Arthur
 80-093144(GE)   | Shrek Der Dritte - Die Suche nach Arthus
-<<<<<<< HEAD
-80-093145(FR)   | Shrek Le Troisieme: L'aventure D'arthur
-=======
 80-093145(FR)   | Shrek Le Troisième: L'aventure D'arthur
->>>>>>> af790a7dcf8be74bb805869f2c5d9071942b38ba
 80-093147(SP)   | Shrek Tercero - Donde esta Arturo?
 -
 80-093160(US)   | Bratz - The Secret Necklace