Resolve conflict with Spring IDE

User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture