Fixed merge conflict in tpl file
Reverted tpl file