resolved merge conflicts on Gemfile
removed extra two divs in index