What was the nature of the disagreement about the terms under which former confederate states might rejoin the union after the civil war