diff --git a/api/api_controller.go b/api/api_controller.go index 2693ade23ab..435b94e154c 100644 --- a/api/api_controller.go +++ b/api/api_controller.go @@ -764,7 +764,7 @@ func (c *Controller) MergeMergeIntoBranchHandler() refs.MergeIntoBranchHandler { func newMergeResultFromCatalog(res *catalog.MergeResult) *models.MergeResult { if res == nil { - return nil + return &models.MergeResult{} } var summary models.MergeResultSummary for k, v := range res.Summary {