Gemfile.lock merge conflict