# Conflicts: # spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java