server side
edited conflicted area