fix basic main template
fix conflict