Some files have been modified.
pom.xml confilct resolved.
Changes.
New files are added.