merge

merge view and template