template and styles
fix conflict in gitignore