Fixed templates after merge