Put back patch conflict testing. Fixes #106