diff --git a/build-packages.sh b/build-packages.sh
index eb5f9001007..14c1b54561b 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-<<<<<<< Updated upstream
 TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 OUT_VERSION=$(echo $TAG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
 echo $TAG_VERSION