price manage dev
conflict resolve