removed the conflicts