Fix merge conflicts in Gemfile.lock