when collision accurs, usually i choose "use my version" or "use other's version" to resolve the collision, but i found that no matter which one i choose, it's always do the "use other's version". it's serious! this problem has been exist for a long time, hope a quick resolve. thanks a lot~
