add some sweet helpers for rendering content blocks
fix merge conflict