Just like Mr Lucky already said, but I prefer template modifications over template edits and then merging also for custom edits. I rather fix the template modification if there's a need too, but from my experience, you'll have less problem with template modifications then with merging templates. But maybe it's just me.