Update template.
No changes to api.
No changes to app.
Fixed merge conflicts.