fixed the small errors for it to run, still need to fix consumer checkout as values are not passing and consumer passes
merge conflict fixed