Update template tags.
Merge conflict.