finished template
fix merge conflicts