diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index a020d806b29..092afa15df4 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.17.0
-=======
-1.14.1
->>>>>>> dev/master