modi pom.xml
modi pom.xml in prasath
commit after conflict