Fix bugs in conflicts detection algorithm.