take back changes in pom
latest changes
try fix merge conflicts