Purchases completed!
fixed merge conflicts