cart works
fixed merge error