added templates
conflict resolved