Bug 899726 - Fix merge conflicts on a CLOSED TREE