template update
fix merge conflict