conflicts resolved except for cart