Solve pom error. Rebase with previous