The Compromise of 1850 was a series of legislative measures aimed at diffusing tensions between slave and free states following the Mexican-American War, ultimately delaying the onset of the American Civil War. It included the admission of California as a free state, the establishment of territorial governments in the rest of the lands acquired from Mexico, and a stricter Fugitive Slave Law.