modify again
resolved the conflicts