Adjust conflict version granularity
