Fixed Pom after merge