preparing for releasing via maven repository
merged conflicts