Added html to feeds index format response
Resolved merge conflict in feeds controller