fix template after merge conflict