Add back in_cart logic after removal from merge conflict