Fix pom merge error