Merge "fix pom"