fixed the conflicts