resolve the conflicts