edit
settle conflict