(#2685) - fix bogus conflicts, remove 20x speedup