updated merge script to account for empty or no template for data.
removed service-template as redundant for services.