edited out all the conflicts again