What two plans were merged into the Great Compromise?