Fix pom broken in merge