edit feature
solve conflicts