diff --git a/script/release-binary b/script/release-binary
index 4c7d6b5882d..0ff4dd63f91 100755
--- a/script/release-binary
+++ b/script/release-binary
@@ -44,7 +44,6 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}"
 # Copy it to the bucket.
 echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/"
 gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/"
-<<<<<<< HEAD
 
 # Build the debug binary
 BINARY_NAME="envoy-debug-${SHA}.tar.gz"
@@ -57,5 +56,3 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}"
 # Copy it to the bucket.
 echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/"
 gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/"
-=======
->>>>>>> origin/rate_limiting