Change analysis name: race is now conflicts and setconflicts