local templates
fixed merge
templates local; cleanedup