Update content block schema and editor disply
Update and merge resouces