resolve conflict

Author: Soroosh Sarabadani

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

@@ -5,7 +5,6 @@
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
 import org.springframework.stereotype.Component;
 
 @Component