Fixed merge conflict in Gemfile.lock