Reverted usage of merged assets in template as errors appear