more large conflict optimizations