I was worried about that but some documentation seemed to imply that even -kb would not stop CVS from using it's merging. Let me do some experiments with -ko to see if it fixes things.