Fixed some of the conflicts