Changed pom.xml
resolve conflict