update feeds for php website
merge conflicts