Conflict recording problem.

[sub]

It's been that way since the beginning. I can understand there may be situations where it isn't the best behaviour, but in general it's worked well.