Fixed merge issues. Cart working.