fix: merge conflicts with master

README.md

@@ -66,17 +66,17 @@ After these four steps and only a couple of minutes, you now have a complete com
 
 Write-ups for all features will be made available in [Github discussions](https://github.com/medusajs/medusa/discussions) prior to starting the implementation process.
 
-### Q1
-
+### H1 2022
 - [x] Admin revamp
 - [x] Tax API
-- [x] Strategy pattern
-- [ ] Promotions API
+- [x] Tax Calculation Strategy
+- [x] Cart Calculation Strategy
+- [x] Customer Groups API
+- [x] Promotions API
+- [x] Price Lists API
+- [x] Price Selection Strategy
 - [ ] Bulk import / export
-
-### Q2
-
-- [ ] Extended Product API (custom fields, price lists, publishing control, and more)
+- [ ] Extended Product API (custom fields, publishing control, and more)
 - [ ] Extended Order API (managing placed orders, improved inventory control, and more)
 - [ ] Sales Channel API
 - [ ] Multi-warehouse support