Stop with the conflicts