make it conflit same time 2

make it conflit same time 2