Some files have been modified.
pom.xml confilct resolved.