Copy and pasted information to merchant, trans, and item builder classes and ran tests.
Cleared out sales engine and made changes to builder classes
fixe merge conflict