fix conflict detection algorithm