templates merge conflict fix