diff --git a/core/vm/eips.go b/core/vm/eips.go
index a2aedb1e89..30bac054c3 100644
--- a/core/vm/eips.go
+++ b/core/vm/eips.go
@@ -846,7 +846,6 @@ func opRetf(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
 		return nil, errStopToken
 	}
 	return nil, nil
->>>>>>> 3532f16eb7 (core/vm: add eof container)
 }
 
 func opJumpf(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
diff --git a/core/vm/validate_test.go b/core/vm/validate_test.go
index ee444a76fb..d91f892eb8 100644
--- a/core/vm/validate_test.go
+++ b/core/vm/validate_test.go
@@ -250,7 +250,7 @@ func TestValidateCode(t *testing.T) {
 			Data:              make([]byte, 0),
 			ContainerSections: make([]*Container, 0),
 		}
-		_, err := validateCode(test.code, test.section, container, &pragueEOFInstructionSet, true)
+		_, err := validateCode(test.code, test.section, container, &pragueEOFInstructionSet, false)
 		if !errors.Is(err, test.err) {
 			t.Errorf("test %d (%s): unexpected error (want: %v, got: %v)", i, common.Bytes2Hex(test.code), test.err, err)
 		}