conflict merge and template