I made notice by using flash
adding delete
I fixed cinflict