make check merge conflict fixes

Author: domdomegg

internal/api/handlers/v0/edit_test.go

@@ -273,7 +273,7 @@ func TestEditServerEndpoint(t *testing.T) {
 				},
 			},
 			setupMocks: func(registry *MockRegistryService) {
-				currentServer := &model.ServerResponse{
+				currentServer := &apiv0.ServerRecord{
 					Server: model.ServerJSON{
 						Name:        "io.github.domdomegg/test-server",
 						Description: "Original server",

internal/service/fake_service.go

@@ -6,14 +6,9 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/modelcontextprotocol/registry/internal/database"
-<<<<<<< HEAD
-	"github.com/modelcontextprotocol/registry/internal/model"
-	"github.com/modelcontextprotocol/registry/internal/validators"
-=======
 	"github.com/modelcontextprotocol/registry/internal/validators"
 	apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
 	"github.com/modelcontextprotocol/registry/pkg/model"
->>>>>>> main
 )
 
 // fakeRegistryService implements RegistryService interface with an in-memory database