Fixed version number in pom for rollback
Fixed merge conflict