reinstate the template merge forking