Fixed the conflicts