Shortcode conflicts

When you define your shortcode, you might try one of a couple “if” statements to fix this issue, until you have time to create separate shortcodes.

function cfgeo_shortcode( $atts, $content = "" ) {
    if (!isset($content) || stristr($content,'cfgeo')!==FALSE){
        // do short shortcode stuff here

    } else {
        // do 'Container' shortcode stuff here

    }
    return $output;
}
add_shortcode( 'cfgeo', 'cfgeo_shortcode' );

I would also recommend … when you create your replacement shortcodes, you should not only create separate codes, you should also avoid parameters with keywords like “return” and “include” for their respective names.

Good luck! Hope this was helpful.