diff --git a/sources b/sources
index 5271097..7ab3b84 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-feb466ad1ea3e34a54819768e6d22450  nfs-ganesha-2.3.0.tar.gz
-=======
 b4fc41095ee567c6d638bdc9cdfe9697  nfs-ganesha-2.3.1.tar.gz
->>>>>>> origin/f23