Be able to resolve the conflicts