adding back lost templates during rebase