Speedup conflict check

Depends on #678