worked on CI page
resolved conflict