Index template
fix merge