first commit
gem and config
Resolve conflict