added helpers for creating feed items
resolved merge conflicts