new cart fw
Resolve merge conflicts