working on hippo
working on header n footer
gemfile changes done
gemfile commit
have done with listing page
resolved conflicts in Gemfile.lock
resolved conflict after merging develop