Changing patterns of industrial conflict