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