House, Senate reconcile differences on economic development, R&D proposals