Final answer:
The Great Compromise resolved a conflict over-representation in the national legislature during the Constitutional Convention of 1787.
Step-by-step explanation:
The Great Compromise, also known as the Connecticut Compromise, resolved a conflict over-representation in the national legislature during the Constitutional Convention of 1787.
It proposed a bicameral congress with two chambers: the Senate and the House of Representatives.
Each state would have two representatives in the Senate, providing equal representation for all states, while representation in the House would be based on the population of each state.