Add first conflict
Add data mining
Other update