diff --git a/build/version.go b/build/version.go
index c86aa929d..4b18f642b 100644
--- a/build/version.go
+++ b/build/version.go
@@ -37,11 +37,7 @@ func BuildTypeString() string {
 }
 
 // BuildVersion is the local build version
-<<<<<<< HEAD
-const BuildVersion = "1.26.3"
-=======
 const BuildVersion = "1.27.0-dev"
->>>>>>> tags/v1.27.0-rc1
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {