Actually resolve the conflicts