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