Fix merge conflict

Author: cppwfs

spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java

@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.assertj.core.api.BDDAssertions;
 import org.junit.jupiter.api.Tag;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;