First commit
pom conflicts resolved