remove the conflicts