making master branch stable
resolved conflicts in pom.xml file
fixed type in maven-clean-plugin config [skip-ci]