huge commit due to line breaks
revert commit fail
merged
fix poms
resolve conflicts