added pom
confict merge