purchase report
conflict resolved