fixed shortcode conflict