add second conflict
new update