Update pom.xml

fix merge error