fix conflict for Gemfile.lock