removed the conflicts2