Fixes to pom, parametrizing inputs via environment variables
Changed merge conflict