partially edit the conflicts