merging conflicts with old template