new template to symlink
remove merge comments