working on comment
conflicts resolved