What sociologist has merged Marx's emphasis on class conflict with Weber's recognition that power is an important element of stratification?

The sociologist who merged Marx's emphasis on class conflict with Weber's recognition of power in stratification is Max Weber. Weber's concept of social stratification goes beyond economic class and includes factors like power and status as well. He believed that power relations between different social groups are crucial in understanding societal inequality.