Fixed a merge error with pom.xml