diff --git a/pkg/controller/storage/capability/capability_controller_test.go b/pkg/controller/storage/capability/capability_controller_test.go
index 22486e5e5..0f9738bd9 100644
--- a/pkg/controller/storage/capability/capability_controller_test.go
+++ b/pkg/controller/storage/capability/capability_controller_test.go
@@ -19,6 +19,10 @@
 package capability
 
 import (
+<<<<<<< HEAD
+=======
+	"github.com/google/go-cmp/cmp"
+>>>>>>> update csiDriver apiVersion
 	"reflect"
 	"testing"
 	"time"