diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 5f8626d43642..72db4a3180b8 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -136,11 +136,7 @@ main() {
 		echo 'deps: {' >> ${uclfile}
 		for dep in ${pkgdeps}; do
 			cat <<EOF >> ${uclfile}
-<<<<<<< HEAD
-	%PKG_NAME_PREFIX%-${dep}: {
-=======
 	${PKG_NAME_PREFIX}-${dep}: {
->>>>>>> internal/freebsd/current/main
 		origin: "base",
 		version: "${PKG_VERSION}"
 	}