Strange user cart error
merge fix