change pom verion to match  branch name
com 1
added new line
solved conflict