Fix pom merge conflict