Quote Originally Posted by picaflor-azul View Post
If the files in the plugin and the template are the same then you need to merge them.

Thanks,

Anne
They are each modified from a vanilla install and therefore the changes made by/for each should be evident. Usually such changes/differences are easily integrated and do not fight with each other so should be rather straight forward.