diff --git a/packages/astro/test/static-build.test.js b/packages/astro/test/static-build.test.js
index 2c4ad5d0dd..01ab3f5372 100644
--- a/packages/astro/test/static-build.test.js
+++ b/packages/astro/test/static-build.test.js
@@ -7,12 +7,7 @@ function addLeadingSlash(path) {
 }
 
 function removeBasePath(path) {
-<<<<<<< HEAD
-	// `/subpath` is defined in the test fixture's Astro config
-	return path.replace('/subpath', '');
-=======
 	return path.replace('/subpath', '')
->>>>>>> f72a3e59 (test: updating build test to expect the base path in links/scripts)
 }
 
 /**