First commit
pom.xml conflicts resolved