Fix merge conflicts
Changed Gemfile.lock