updating asset pipeline and feed
merging conflicts