Moved the Update template parameters to a listener
Fixed merge conflict