updating README with news changes
updating wrong conflicts