Adding Gemfile
Resolve conflict