fixing templates conflicts