That's what I was worried about, but I guess you can't have merge conflicts if you freeze the code.
Suppose you couldn't freeze the code, then what would you have done?