solve merge on Gemfile.lock