fixed template conflicts