Nima,
Yes, some time back Jeff Davis mentioned to me. I haven't update CVS with the new version of LORS (which you might want to check out as it is really neat at the Concord site -Caroline posted the message today).
In my new update, I'll make sure that I modify the conflict so it all goes alright. No worries.
Thanks,
Ernie