applying Mike McCandless suggestions: NRT, reopen twice to reveal the merge