# Conflicts: # gradle.properties # spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
# Conflicts: # gradle.properties # spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java