add main style :: typography and block
correct merge