Allow template override of no-conflict file