sales rep add finished
conflict resolved