No bug - Fix merge conflict on a CLOSED TREE. r=red