Merge fixed
Phase 3 √