Social change and the convergence of conflict theory