What is the resolution to the conflicts that arose regarding states rights and the federal government

What is the resolution to the conflicts that arose regarding states rights and the federal government