add feeds (doesn't work yet)
resolved merge conflict