adds admin_block
fix merge conflict