Fixing poms after rebasing