I believe the answer is: B) The agreement between the House of Representatives and the Senate to agree on creating three branches of government.
The conflict that solved through the great compromise revolved around how the states should be represented within the government body. They later on agreed on creating three branches of government that can limit each other's power, and providing states to send their representatives to work within each branches.
