basepoints
target/m2e-jee/web-resources/META-INF/maven/fyWeb/gis/pom.properties
conflict
delete 2 files