Remove dead merge conflict code.

api/krusty/kustomizer.go

@@ -52,9 +52,7 @@ func MakeKustomizer(o *Options) *Kustomizer {
 // and Run can be called on each of them).
 func (b *Kustomizer) Run(
 	fSys filesys.FileSystem, path string) (resmap.ResMap, error) {
-	resmapFactory := resmap.NewFactory(
-		b.depProvider.GetResourceFactory(),
-		b.depProvider.GetConflictDetectorFactory())
+	resmapFactory := resmap.NewFactory(b.depProvider.GetResourceFactory())
 	lr := fLdr.RestrictionNone
 	if b.options.LoadRestrictions == types.LoadRestrictionsRootOnly {
 		lr = fLdr.RestrictionRootOnly

api/krusty/multiplepatch_test.go

@@ -706,7 +706,7 @@ metadata:
 `)
 }
 
-func TestMultiplePatchesWithConflict(t *testing.T) {
+func TestNonCommutablePatches(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	makeCommonFilesForMultiplePatchTests(th)
 	th.WriteF("overlay/staging/deployment-patch1.yaml", `