Resolved the conflicts