Merge branch 'main' into 4.0.x

Author: philwebb

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java

@@ -45,11 +45,7 @@ class ConnectionFactoryOptionsBuilderTests {
 	@Test
 	void createWhenDriverProtocolIsNullThrowsException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ConnectionFactoryOptionsBuilder(null, 123))
-<<<<<<< HEAD
-			.withMessage("'driverProtocol' must not be null");
-=======
-			.withMessage("Driver must not be null");
->>>>>>> 3.4.x
+			.withMessage("'driver' must not be null");
 	}
 
 	@Test