Update pom.xml

Fixed merge issue in pom.xml