fix comment template to merge with master