fix some conditional formatting
finish combineBlocks specs for content manager