added control on feed
merge conflicts