Merge conflict in feed.html