Git merge conflict only on version tag in pom.xml Git merge conflict only on version tag in pom.xml git git