Fix previous commit conflicts

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/listener/FailedBatchProcessor.java

@@ -79,15 +79,6 @@ protected CommonErrorHandler getFallbackBatchHandler() {
 		return this.fallbackBatchHandler;
 	}
 
-	/**
-	 * Return the fallback batch error handler.
-	 * @return the handler.
-	 * @since 2.8.8
-	 */
-	protected CommonErrorHandler getFallbackBatchHandler() {
-		return this.fallbackBatchHandler;
-	}
-
 	protected void doHandle(Exception thrownException, ConsumerRecords<?, ?> data, Consumer<?, ?> consumer,
 			MessageListenerContainer container, Runnable invokeListener) {
 

spring-kafka/src/main/java/org/springframework/kafka/listener/FailedRecordProcessor.java

@@ -30,6 +30,7 @@
 import org.springframework.core.log.LogAccessor;
 import org.springframework.kafka.support.TopicPartitionOffset;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.backoff.BackOff;
 
 /**