pom
conflicts resolved code