recover from bad merge of no-shadow