Yes, there was an error merging the templates. I have gone through all the places where the error happened and have resolved them. You can now download the updated the style with the proper fix. I am sorry for this trouble.

Regards,
Ketan