resolved the conflicts