Fixed template tag
Merge