kill the conflicts