correct the conflicts