unsaved merge leftovers