diff --git a/chat.go b/chat.go
index 9197d8bf3..16589b8c4 100644
--- a/chat.go
+++ b/chat.go
@@ -149,11 +149,7 @@ type JSONSchemaDefine struct {
 	Properties map[string]*JSONSchemaDefine `json:"properties,omitempty"`
 	// Required is a required of JSON Schema. It used if Type is JSONSchemaTypeObject.
 	Required []string `json:"required,omitempty"`
-<<<<<<< HEAD
 	// Items is a property of JSON Schema. It used if Type is JSONSchemaTypeArray.
-=======
-	// Items is a items of JSON Schema. It used if Type is JSONSchemaTypeArray.
->>>>>>> e94a13e (chore: add back removed interfaces, custom marshal)
 	Items *JSONSchemaDefine `json:"items,omitempty"`
 }
 
diff --git a/chat_test.go b/chat_test.go
index bc397ef46..c4f5998c6 100644
--- a/chat_test.go
+++ b/chat_test.go
@@ -102,7 +102,6 @@ func TestChatCompletionsFunctions(t *testing.T) {
 			},
 			Functions: []*FunctionDefine{{
 				Name: "test",
-				//nolint:lll
 				Parameters: &FunctionParams{
 					Properties: map[string]*JSONSchemaDefine{
 						"count": {