Were any high-ranking Confederate officers allowed to re-join the United States military following the Civil War? If so, did this cause any controversy within the corps involved?