added modal to tpl
fix conflict