Feature/refactor merge shortcode