Was The conflict between slave and free states resolved by the great compromise?

The compromise between slave states and free states was resolved by the 3/5ths Compromise. The southern states wanted to have slaves count as part of the population. The free states did not. They eventually agreed that the 3 out of every 5 slaves would be counted. The Great Compromise was when the legislature was agreed to be made of 2 houses, one upper and one lower. The upper house would have equal representation and the lower would be have the states represented by population.