How did the delegates to the convention resolve tensions between large and small states?

By making representation in the House of Representatives proportionate to population and representation in the Senate equal for each state