Change pom
Merge origin/master