Conflicts resolve in pom.xml