diff --git a/sources b/sources
index 54045b2..a8f9830 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f962c93a2d63b449fa3f6612ade3b028  scantailor-0.9.10.tar.gz
-=======
 15984c8828ecb2de542ac94e3c41a810  scantailor-0.9.11.tar.gz
->>>>>>> master