diff --git a/pkg/endpoints/handlers/rest.go b/pkg/endpoints/handlers/rest.go
index a1f36ed7f..c1fdeeb60 100644
--- a/pkg/endpoints/handlers/rest.go
+++ b/pkg/endpoints/handlers/rest.go
@@ -39,6 +39,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/mergepatch"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
@@ -658,7 +659,7 @@ func patchResource(
 				}
 			}
 
-			hasConflicts, err := strategicpatch.HasConflicts(originalPatchMap, currentPatchMap)
+			hasConflicts, err := mergepatch.HasConflicts(originalPatchMap, currentPatchMap)
 			if err != nil {
 				return nil, err
 			}