Keep existing tree-conflict viz until promted.