Bug 795376 - Followup to fix bustage from incorrect conflict resolution on a CLOSED TREE