attempts to resolve merge conflits pt 2 (removing prepush from package.json)
attempts to resolve merge conflits pt 2 (removing prepush from package.json)

jmregan0/grace-shopper,jmregan0/grace-shopper,jmregan0/grace-shopper