The controversy over __________ took the form of a dispute over national government supremacy versus the rights of the separate states.