Resolving merge regression on template name