Title: A combined Ricardian and Heckscher-Ohlin model of comparative advantage