update gradle template
fix merge