Fixed pom.xml from merge