modified pom.xml with merge