Fixed the conflicts issues