What did the great compromise of 1787 settle differences between?

The Great Compromise settled the method of representation in the legislative branch (the US Congress). Small states wanted equal representation (equality by state), and large states wanted representation based on population (equality by vote). 
Under the compromise, all states were represented equally in the Senate. This made the smaller states happy. In the House of Representatives, representation was based on population. This pleased the bigger states.