recover from disaster (fubar merge)