Which of these resolved conflict between the two plans of government presented at the Constitutional Convention?