Fixed gem group conflicts
Added gemfile.lock