merge spring-data-jpa