Merge to Product.tpl's

[AndyC]

I have some additional coding on my Panda product page like tabs but am finding it difficult to merge files and it never seems to work for me and always seem to end up with a 500 error.Am using win merge.

When I updated from 1.5.0 to 1.5.1 I just used the same tpl , but there seems to be more changes than last time and I am not really sure if it is my tab code is the cause of the issue

 

thanks