# Conflicts: # build.gradle # spring-core/src/main/java/org/springframework/core/convert/Property.java