New Store Implementation - Phase 1
Gemfile conflict