modi pom.xml
commit after conflict
pom.xml modified