backend edits
conflict res