Bug 1030945 - Fix mistake from resolving a merge conflict on an already CLOSED TREE