Update template tags in registration templates.
Fix merge conflicts.