Fix up minor merge resolution error.
Fixed XML doc warnings in Template.cs.