Fix broken template after merge. Please pay more attention when merging code.