fix pom version caused by bad merge