Fix feed template
Merge