Sales - Change

You know damn well what I did
I fixed up the conflicts