Fixed merge typo bug + template html link