# Conflicts: # team1/pom.xml # team1/src/main/java/com/example/demo/repository/Book_CollectionRepository.java