restyle base template
fix merge conflict