Adding empty cart feature
conflict