modman fix
Badge Block
conflict resolve