shortcode conflict

hi, my theme has built in shortcodes for the accordion jquery and your markup uses a different layout, I’ve rewritten the shortcode via my functions.php file and named it [qa_new] to get the output of your plugin to match my themes use of the accordion, so I was just wondering how likely it is that the shortcode will be updated in future updates that I might lose functionality by having overwritten it in my theme?

Hope this makes sense?!

http://wordpress.org/extend/plugins/q-and-a/